X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tapi%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Ftapi%2Ftopology%2FConvertORTopoToFullTapiTopoTest.java;h=272caa5b28e3616d7272a3faf1b0b11489a3aa19;hb=ee81f24e14686bfb96cfa404592ad89117c01aa7;hp=6c67a84d3c756fefcc0922490549071f1b45ad80;hpb=e50901c4b06c82b91f136dac09bacce01258d7b2;p=transportpce.git diff --git a/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToFullTapiTopoTest.java b/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToFullTapiTopoTest.java index 6c67a84d3..272caa5b2 100644 --- a/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToFullTapiTopoTest.java +++ b/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToFullTapiTopoTest.java @@ -14,10 +14,10 @@ import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.hasItems; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import com.google.common.util.concurrent.FluentFuture; import java.nio.charset.Charset; @@ -30,27 +30,25 @@ import java.util.UUID; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; import org.eclipse.jdt.annotation.Nullable; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.InstanceIdentifiers; import org.opendaylight.transportpce.common.network.NetworkTransactionImpl; import org.opendaylight.transportpce.common.network.NetworkTransactionService; -import org.opendaylight.transportpce.common.network.RequestProcessor; import org.opendaylight.transportpce.tapi.TapiStringConstants; import org.opendaylight.transportpce.tapi.utils.TapiLink; import org.opendaylight.transportpce.tapi.utils.TapiTopologyDataUtils; import org.opendaylight.transportpce.test.AbstractTest; import org.opendaylight.transportpce.test.utils.TopologyDataUtils; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1Builder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1Builder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Link1; +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.state.types.rev191129.State; import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.AdminStates; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmLinkType; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmTpType; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.OpenroadmLinkType; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.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; @@ -59,7 +57,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.Node; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.NodeBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.NodeKey; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.LinkId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Network1; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.TpId; @@ -106,14 +103,11 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { private static final Logger LOG = LoggerFactory.getLogger(ConvertORTopoToFullTapiTopoTest.class); private static Node otnMuxA; - private static Node otnMuxC; private static Node otnSwitch; private static Node tpdr100G; private static Node roadmA; private static Node roadmC; private static Network openroadmNet; - private static Map otnLinks; private static Map ortopoLinks; private static Uuid topologyUuid; @@ -121,8 +115,8 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { private static TapiLink tapiLink; private static DataBroker dataBroker = getDataBroker(); - @BeforeClass - public static void setUp() throws InterruptedException, ExecutionException { + @BeforeAll + static void setUp() throws InterruptedException, ExecutionException { TopologyDataUtils.writeTopologyFromFileToDatastore(getDataStoreContextUtil(), TapiTopologyDataUtils.OPENROADM_TOPOLOGY_FILE, InstanceIdentifiers.OVERLAY_NETWORK_II); TopologyDataUtils.writeTopologyFromFileToDatastore(getDataStoreContextUtil(), @@ -145,7 +139,7 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { .child(Node.class, new NodeKey(new NodeId("SPDR-SC1-XPDR1"))); FluentFuture> muxCFuture = dataBroker.newReadOnlyTransaction() .read(LogicalDatastoreType.CONFIGURATION, muxCIID); - otnMuxC = muxCFuture.get().get(); + muxCFuture.get().get(); 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"))) @@ -182,7 +176,7 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { .augmentation(Network1.class); FluentFuture> linksFuture = dataBroker.newReadOnlyTransaction() .read(LogicalDatastoreType.CONFIGURATION, linksIID); - otnLinks = linksFuture.get().get().getLink(); + linksFuture.get().get().getLink(); InstanceIdentifier links1IID = InstanceIdentifier.create(Networks.class) .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network @@ -201,14 +195,13 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { topologyUuid = new Uuid(UUID.nameUUIDFromBytes(TapiStringConstants.T0_FULL_MULTILAYER.getBytes( Charset.forName("UTF-8"))).toString()); - networkTransactionService = new NetworkTransactionImpl( - new RequestProcessor(getDataStoreContextUtil().getDataBroker())); + networkTransactionService = new NetworkTransactionImpl(getDataBroker()); tapiLink = new TapiLink(networkTransactionService); LOG.info("TEST SETUP READY"); } @Test - public void convertNodeWhenNoStates() { + void convertNodeWhenNoStates() { Node tpdr = changeTerminationPointState(tpdr100G, "XPDR1-NETWORK1", "XPDR1-CLIENT1", null, null); List networkPortList = new ArrayList<>(); for (TerminationPoint tp : tpdr100G.augmentation(Node1.class).getTerminationPoint().values()) { @@ -231,12 +224,12 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+iODU+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) .toString()); OwnedNodeEdgePoint enepN = dsrNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(enetworkNepUuid)); - assertNull("Administrative State should not be present", enepN.getAdministrativeState()); - assertNull("Operational State should not be present", enepN.getOperationalState()); + assertNull(enepN.getAdministrativeState(), "Administrative State should not be present"); + assertNull(enepN.getOperationalState(), "Operational State should not be present"); OwnedNodeEdgePoint inepN = dsrNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(inetworkNepUuid)); - assertNull("Administrative State should not be present", inepN.getAdministrativeState()); - assertNull("Operational State should not be present", inepN.getOperationalState()); + assertNull(inepN.getAdministrativeState(), "Administrative State should not be present"); + assertNull(inepN.getOperationalState(), "Operational State should not be present"); Uuid otsiNodeUuid = new Uuid(UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+OTSi".getBytes(Charset.forName("UTF-8"))) .toString()); @@ -247,26 +240,26 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+eOTSi+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) .toString()); OwnedNodeEdgePoint enep = otsiNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(enepUuid)); - assertNull("Administrative State should not be present", enep.getAdministrativeState()); - assertNull("Operational State should not be present", enep.getOperationalState()); + assertNull(enep.getAdministrativeState(), "Administrative State should not be present"); + assertNull(enep.getOperationalState(), "Operational State should not be present"); Uuid inepUuid = new Uuid( UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+iOTSi+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) .toString()); OwnedNodeEdgePoint inep = otsiNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(inepUuid)); - assertNull("Administrative State should not be present", inep.getAdministrativeState()); - assertNull("Operational State should not be present", inep.getOperationalState()); + assertNull(inep.getAdministrativeState(), "Administrative State should not be present"); + assertNull(inep.getOperationalState(), "Operational State should not be present"); Uuid photnepUuid = new Uuid( UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+PHOTONIC_MEDIA+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) .toString()); OwnedNodeEdgePoint photnep = otsiNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(photnepUuid)); - assertNull("Administrative State should not be present", photnep.getAdministrativeState()); - assertNull("Operational State should not be present", photnep.getOperationalState()); + assertNull(photnep.getAdministrativeState(), "Administrative State should not be present"); + assertNull(photnep.getOperationalState(), "Operational State should not be present"); } @Test - public void convertNodeWhenBadStates1() { + void convertNodeWhenBadStates1() { Node tpdr = changeTerminationPointState(tpdr100G, "XPDR1-NETWORK1", "XPDR1-CLIENT1", AdminStates.OutOfService, State.OutOfService); List networkPortList = new ArrayList<>(); @@ -290,16 +283,14 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+iODU+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) .toString()); OwnedNodeEdgePoint enepN = dsrNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(enetworkNepUuid)); - assertEquals("Administrative State should be Locked", - AdministrativeState.LOCKED, enepN.getAdministrativeState()); - assertEquals("Operational State should be Disabled", - OperationalState.DISABLED, enepN.getOperationalState()); + assertEquals(AdministrativeState.LOCKED, enepN.getAdministrativeState(), + "Administrative State should be Locked"); + assertEquals(OperationalState.DISABLED, enepN.getOperationalState(), "Operational State should be Disabled"); OwnedNodeEdgePoint inepN = dsrNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(inetworkNepUuid)); - assertEquals("Administrative State should be Locked", - AdministrativeState.LOCKED, inepN.getAdministrativeState()); - assertEquals("Operational State should be Disabled", - OperationalState.DISABLED, inepN.getOperationalState()); + assertEquals(AdministrativeState.LOCKED, inepN.getAdministrativeState(), + "Administrative State should be Locked"); + assertEquals(OperationalState.DISABLED, inepN.getOperationalState(), "Operational State should be Disabled"); Uuid otsiNodeUuid = new Uuid(UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+OTSi".getBytes(Charset.forName("UTF-8"))) .toString()); @@ -310,32 +301,29 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+eOTSi+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) .toString()); OwnedNodeEdgePoint enep = otsiNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(enepUuid)); - assertEquals("Administrative State should be Locked", - AdministrativeState.LOCKED, enep.getAdministrativeState()); - assertEquals("Operational State should be Disabled", - OperationalState.DISABLED, enep.getOperationalState()); + assertEquals(AdministrativeState.LOCKED, enep.getAdministrativeState(), + "Administrative State should be Locked"); + assertEquals(OperationalState.DISABLED, enep.getOperationalState(), "Operational State should be Disabled"); Uuid inepUuid = new Uuid( UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+iOTSi+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) .toString()); OwnedNodeEdgePoint inep = otsiNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(inepUuid)); - assertEquals("Administrative State should be Locked", - AdministrativeState.LOCKED, inep.getAdministrativeState()); - assertEquals("Operational State should be Disabled", - OperationalState.DISABLED, inep.getOperationalState()); + assertEquals(AdministrativeState.LOCKED, inep.getAdministrativeState(), + "Administrative State should be Locked"); + assertEquals(OperationalState.DISABLED, inep.getOperationalState(), "Operational State should be Disabled"); Uuid photnepUuid = new Uuid( UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+PHOTONIC_MEDIA+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) .toString()); OwnedNodeEdgePoint photnep = otsiNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(photnepUuid)); - assertEquals("Administrative State should be Locked", - AdministrativeState.LOCKED, photnep.getAdministrativeState()); - assertEquals("Operational State should be Disabled", - OperationalState.DISABLED, photnep.getOperationalState()); + assertEquals(AdministrativeState.LOCKED, photnep.getAdministrativeState(), + "Administrative State should be Locked"); + assertEquals(OperationalState.DISABLED, photnep.getOperationalState(), "Operational State should be Disabled"); } @Test - public void convertNodeWhenBadStates2() { + void convertNodeWhenBadStates2() { Node tpdr = changeTerminationPointState(tpdr100G, "XPDR1-NETWORK1", "XPDR1-CLIENT1", AdminStates.Maintenance, State.Degraded); List networkPortList = new ArrayList<>(); @@ -359,16 +347,14 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+iODU+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) .toString()); OwnedNodeEdgePoint enepN = dsrNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(enetworkNepUuid)); - assertEquals("Administrative State should be Locked", - AdministrativeState.LOCKED, enepN.getAdministrativeState()); - assertEquals("Operational State should be Disabled", - OperationalState.DISABLED, enepN.getOperationalState()); + assertEquals(AdministrativeState.LOCKED, enepN.getAdministrativeState(), + "Administrative State should be Locked"); + assertEquals(OperationalState.DISABLED, enepN.getOperationalState(), "Operational State should be Disabled"); OwnedNodeEdgePoint inepN = dsrNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(inetworkNepUuid)); - assertEquals("Administrative State should be Locked", - AdministrativeState.LOCKED, inepN.getAdministrativeState()); - assertEquals("Operational State should be Disabled", - OperationalState.DISABLED, inepN.getOperationalState()); + assertEquals(AdministrativeState.LOCKED, inepN.getAdministrativeState(), + "Administrative State should be Locked"); + assertEquals(OperationalState.DISABLED, inepN.getOperationalState(), "Operational State should be Disabled"); Uuid otsiNodeUuid = new Uuid(UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+OTSi".getBytes(Charset.forName("UTF-8"))) .toString()); @@ -379,231 +365,29 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+eOTSi+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) .toString()); OwnedNodeEdgePoint enep = otsiNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(enepUuid)); - assertEquals("Administrative State should be Locked", - AdministrativeState.LOCKED, enep.getAdministrativeState()); - assertEquals("Operational State should be Disabled", - OperationalState.DISABLED, enep.getOperationalState()); + assertEquals(AdministrativeState.LOCKED, enep.getAdministrativeState(), + "Administrative State should be Locked"); + assertEquals(OperationalState.DISABLED, enep.getOperationalState(), "Operational State should be Disabled"); Uuid inepUuid = new Uuid( UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+iOTSi+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) .toString()); OwnedNodeEdgePoint inep = otsiNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(inepUuid)); - assertEquals("Administrative State should be Locked", - AdministrativeState.LOCKED, inep.getAdministrativeState()); - assertEquals("Operational State should be Disabled", - OperationalState.DISABLED, inep.getOperationalState()); + assertEquals(AdministrativeState.LOCKED, inep.getAdministrativeState(), + "Administrative State should be Locked"); + assertEquals(OperationalState.DISABLED, inep.getOperationalState(), "Operational State should be Disabled"); Uuid photnepUuid = new Uuid( UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+PHOTONIC_MEDIA+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) .toString()); OwnedNodeEdgePoint photnep = otsiNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(photnepUuid)); - assertEquals("Administrative State should be Locked", - AdministrativeState.LOCKED, photnep.getAdministrativeState()); - assertEquals("Operational State should be Disabled", - OperationalState.DISABLED, photnep.getOperationalState()); + assertEquals(AdministrativeState.LOCKED, photnep.getAdministrativeState(), + "Administrative State should be Locked"); + assertEquals(OperationalState.DISABLED, photnep.getOperationalState(), "Operational State should be Disabled"); } @Test - public 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( - new LinkId("ODTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1"))), null, null); - otnLinksAlt.replace(link.key(), link); - - ConvertORTopoToTapiFullTopo tapiFactory = new ConvertORTopoToTapiFullTopo(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()); - } - } - tapiFactory.convertNode(otnMuxA, networkPortListA); - List networkPortListC = new ArrayList<>(); - for (TerminationPoint tp : otnMuxC.augmentation(Node1.class).getTerminationPoint().values()) { - if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) { - networkPortListC.add(tp.getTpId().getValue()); - } - } - tapiFactory.convertNode(otnMuxC, networkPortListC); - tapiFactory.convertLinks(otnLinksAlt); - - List tapiLinks - = tapiFactory.getTapiLinks().values().stream() - .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue())) - .collect(Collectors.toList()); - assertNull("Administrative State should not be present", tapiLinks.get(3).getAdministrativeState()); - assertEquals("Administrative state should be UNLOCKED", - AdministrativeState.UNLOCKED, tapiLinks.get(0).getAdministrativeState()); - assertNull("Operational State should not be present", tapiLinks.get(3).getOperationalState()); - assertEquals("Operational state should be ENABLED", - OperationalState.ENABLED, tapiLinks.get(0).getOperationalState()); - } - - @Test - public 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( - new LinkId("ODTU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1"))), null, null); - otnLinksAlt.replace(link.key(), link); - - ConvertORTopoToTapiFullTopo tapiFactory = new ConvertORTopoToTapiFullTopo(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()); - } - } - tapiFactory.convertNode(otnMuxA, networkPortListA); - List networkPortListC = new ArrayList<>(); - for (TerminationPoint tp : otnMuxC.augmentation(Node1.class).getTerminationPoint().values()) { - if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) { - networkPortListC.add(tp.getTpId().getValue()); - } - } - tapiFactory.convertNode(otnMuxC, networkPortListC); - tapiFactory.convertLinks(otnLinksAlt); - - List tapiLinks - = tapiFactory.getTapiLinks().values().stream() - .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue())) - .collect(Collectors.toList()); - assertNull("Administrative State should not be present", tapiLinks.get(3).getAdministrativeState()); - assertEquals("Administrative state should be UNLOCKED", - AdministrativeState.UNLOCKED, tapiLinks.get(0).getAdministrativeState()); - assertNull("Operational State should not be present", tapiLinks.get(3).getOperationalState()); - assertEquals("Operational state should be ENABLED", - OperationalState.ENABLED, tapiLinks.get(0).getOperationalState()); - } - - @Test - public 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( - new LinkId("ODTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1"))), - AdminStates.OutOfService, State.OutOfService); - otnLinksAlt.replace(link.key(), link); - - ConvertORTopoToTapiFullTopo tapiFactory = new ConvertORTopoToTapiFullTopo(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()); - } - } - tapiFactory.convertNode(otnMuxA, networkPortListA); - List networkPortListC = new ArrayList<>(); - for (TerminationPoint tp : otnMuxC.augmentation(Node1.class).getTerminationPoint().values()) { - if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) { - networkPortListC.add(tp.getTpId().getValue()); - } - } - tapiFactory.convertNode(otnMuxC, networkPortListC); - tapiFactory.convertLinks(otnLinksAlt); - - List tapiLinks - = tapiFactory.getTapiLinks().values().stream() - .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue())) - .collect(Collectors.toList()); - assertEquals("Administrative state should be LOCKED", - AdministrativeState.LOCKED, tapiLinks.get(3).getAdministrativeState()); - assertEquals("Administrative state should be UNLOCKED", - AdministrativeState.UNLOCKED, tapiLinks.get(0).getAdministrativeState()); - assertEquals("Operational state should be DISABLED", - OperationalState.DISABLED, tapiLinks.get(3).getOperationalState()); - assertEquals("Operational state should be ENABLED", - OperationalState.ENABLED, tapiLinks.get(0).getOperationalState()); - } - - @Test - public 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( - new LinkId("ODTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1"))), - AdminStates.Maintenance, State.Degraded); - otnLinksAlt.replace(link.key(), link); - - ConvertORTopoToTapiFullTopo tapiFactory = new ConvertORTopoToTapiFullTopo(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()); - } - } - tapiFactory.convertNode(otnMuxA, networkPortListA); - List networkPortListC = new ArrayList<>(); - for (TerminationPoint tp : otnMuxC.augmentation(Node1.class).getTerminationPoint().values()) { - if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) { - networkPortListC.add(tp.getTpId().getValue()); - } - } - tapiFactory.convertNode(otnMuxC, networkPortListC); - tapiFactory.convertLinks(otnLinksAlt); - - List tapiLinks - = tapiFactory.getTapiLinks().values().stream() - .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue())) - .collect(Collectors.toList()); - assertEquals("Administrative state should be LOCKED", - AdministrativeState.LOCKED, tapiLinks.get(3).getAdministrativeState()); - assertEquals("Administrative state should be UNLOCKED", - AdministrativeState.UNLOCKED, tapiLinks.get(0).getAdministrativeState()); - assertEquals("Operational state should be DISABLED", - OperationalState.DISABLED, tapiLinks.get(3).getOperationalState()); - assertEquals("Operational state should be ENABLED", - OperationalState.ENABLED, tapiLinks.get(0).getOperationalState()); - } - - @Test - public 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( - new LinkId("ODTU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1"))), - AdminStates.OutOfService, State.OutOfService); - otnLinksAlt.replace(link.key(), link); - - ConvertORTopoToTapiFullTopo tapiFactory = new ConvertORTopoToTapiFullTopo(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()); - } - } - tapiFactory.convertNode(otnMuxA, networkPortListA); - List networkPortListC = new ArrayList<>(); - for (TerminationPoint tp : otnMuxC.augmentation(Node1.class).getTerminationPoint().values()) { - if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) { - networkPortListC.add(tp.getTpId().getValue()); - } - } - tapiFactory.convertNode(otnMuxC, networkPortListC); - tapiFactory.convertLinks(otnLinksAlt); - - List tapiLinks - = tapiFactory.getTapiLinks().values().stream() - .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue())) - .collect(Collectors.toList()); - assertEquals("Administrative state should be LOCKED", - AdministrativeState.LOCKED, tapiLinks.get(3).getAdministrativeState()); - assertEquals("Administrative state should be UNLOCKED", - AdministrativeState.UNLOCKED, tapiLinks.get(0).getAdministrativeState()); - assertEquals("Operational state should be DISABLED", - OperationalState.DISABLED, tapiLinks.get(3).getOperationalState()); - assertEquals("Operational state should be ENABLED", - OperationalState.ENABLED, tapiLinks.get(0).getOperationalState()); - } - - @Test - public void convertNodeForTransponder100G() { + void convertNodeForTransponder100G() { ConvertORTopoToTapiFullTopo tapiFactory = new ConvertORTopoToTapiFullTopo(topologyUuid, tapiLink); List networkPortList = new ArrayList<>(); for (TerminationPoint tp : tpdr100G.augmentation(Node1.class).getTerminationPoint().values()) { @@ -617,8 +401,8 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { .sorted((n1, n2) -> n1.getUuid().getValue().compareTo(n2.getUuid().getValue())) .collect(Collectors.toList()); - assertEquals("Node list size should be 2", 2, tapiFactory.getTapiNodes().size()); - assertEquals("Link list size should be 2", 2, tapiFactory.getTapiLinks().size()); + assertEquals(2, tapiFactory.getTapiNodes().size(), "Node list size should be 2"); + assertEquals(2, tapiFactory.getTapiLinks().size(), "Link list size should be 2"); Uuid dsrNodeUuid = new Uuid(UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+DSR".getBytes(Charset.forName("UTF-8"))) .toString()); @@ -636,7 +420,7 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { } @Test - public void convertNodeForOtnMuxponder() { + void convertNodeForOtnMuxponder() { ConvertORTopoToTapiFullTopo tapiFactory = new ConvertORTopoToTapiFullTopo(topologyUuid, tapiLink); List networkPortList = new ArrayList<>(); for (TerminationPoint tp : otnMuxA.augmentation(Node1.class).getTerminationPoint().values()) { @@ -650,8 +434,8 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { .sorted((n1, n2) -> n1.getUuid().getValue().compareTo(n2.getUuid().getValue())) .collect(Collectors.toList()); - assertEquals("Node list size should be 2", 2, tapiFactory.getTapiNodes().size()); - assertEquals("Link list size should be 1", 1, tapiFactory.getTapiLinks().size()); + 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"); @@ -668,7 +452,7 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { } @Test - public void convertNodeForOtnSwitch() { + void convertNodeForOtnSwitch() { ConvertORTopoToTapiFullTopo tapiFactory = new ConvertORTopoToTapiFullTopo(topologyUuid, tapiLink); List networkPortList = new ArrayList<>(); for (TerminationPoint tp : otnSwitch.augmentation(Node1.class).getTerminationPoint().values()) { @@ -682,8 +466,8 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { .sorted((n1, n2) -> n1.getUuid().getValue().compareTo(n2.getUuid().getValue())) .collect(Collectors.toList()); - assertEquals("Node list size should be 2", 2, tapiFactory.getTapiNodes().size()); - assertEquals("Link list size should be 4", 4, tapiFactory.getTapiLinks().size()); + assertEquals(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()); @@ -701,65 +485,12 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { } @Test - public void convertOtnLink() { - ConvertORTopoToTapiFullTopo tapiFactory = new ConvertORTopoToTapiFullTopo(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()); - } - } - tapiFactory.convertNode(otnMuxA, networkPortListA); - List networkPortListC = new ArrayList<>(); - for (TerminationPoint tp : otnMuxC.augmentation(Node1.class).getTerminationPoint().values()) { - if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) { - networkPortListC.add(tp.getTpId().getValue()); - } - } - tapiFactory.convertNode(otnMuxC, networkPortListC); - tapiFactory.convertLinks(otnLinks); - assertEquals("Link list size should be 4", 4, tapiFactory.getTapiLinks().size()); - - 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() - .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue())) - .collect(Collectors.toList()); - checkOtnLink(links.get(3), 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, - "SPDR-SA1-XPDR1+iOTSi+XPDR1-NETWORK1toSPDR-SC1-XPDR1+iOTSi+XPDR1-NETWORK1"); - } - - @Test - public void convertNodeForRoadmWhenNoOtnMuxAttached() { + void convertNodeForRoadmWhenNoOtnMuxAttached() { ConvertORTopoToTapiFullTopo tapiFactory = new ConvertORTopoToTapiFullTopo(topologyUuid, tapiLink); tapiFactory.convertRoadmNode(roadmA, openroadmNet); - assertEquals("Node list size should be 1", 1, tapiFactory.getTapiNodes().size()); - assertEquals("Link list size should be empty", 0, tapiFactory.getTapiLinks().size()); + 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 roadmNodeUuid = new Uuid(UUID.nameUUIDFromBytes((roadmA.getNodeId().getValue() + "+PHOTONIC_MEDIA") @@ -768,7 +499,7 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { } @Test - public void convertNodeForRoadmWhenRoadmNeighborAttached() { + void convertNodeForRoadmWhenRoadmNeighborAttached() { ConvertORTopoToTapiFullTopo tapiFactory = new ConvertORTopoToTapiFullTopo(topologyUuid, tapiLink); tapiFactory.convertRoadmNode(roadmA, openroadmNet); tapiFactory.convertRoadmNode(roadmC, openroadmNet); @@ -778,8 +509,8 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { .collect(Collectors.toList()); tapiFactory.convertRdmToRdmLinks(rdmTordmLinkList); - assertEquals("Node list size should be 2", 2, tapiFactory.getTapiNodes().size()); - assertEquals("Link list size should be 1", 1, tapiFactory.getTapiLinks().size()); + assertEquals(2, tapiFactory.getTapiNodes().size(), "Node list size should be 2"); + assertEquals(1, tapiFactory.getTapiLinks().size(), "Link list size should be 1"); List tapiNodes = tapiFactory.getTapiNodes().values().stream().collect(Collectors.toList()); @@ -808,7 +539,7 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { } @Test - public void convertNodeForRoadmWhenOtnMuxAttached() { + void convertNodeForRoadmWhenOtnMuxAttached() { ConvertORTopoToTapiFullTopo tapiFactory = new ConvertORTopoToTapiFullTopo(topologyUuid, tapiLink); List networkPortListA = new ArrayList<>(); for (TerminationPoint tp : otnMuxA.augmentation(Node1.class).getTerminationPoint().values()) { @@ -834,8 +565,8 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { .collect(Collectors.toList()); xponderInLinkList.addAll(xponderOutLinkList); tapiFactory.convertXpdrToRdmLinks(xponderInLinkList); - assertEquals("Node list size should be 3", 3, tapiFactory.getTapiNodes().size()); - assertEquals("Link list size should be 2", 2, tapiFactory.getTapiLinks().size()); + 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())) @@ -865,18 +596,17 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { } private void checkDsrNode(org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node node, - Uuid nodeUuid, String dsrNodeType, String nodeId) { - assertEquals("incorrect node uuid", nodeUuid, node.getUuid()); - assertEquals("incorrect node name", nodeId + "+DSR", node.getName().get( - new NameKey("dsr/odu node name")).getValue()); - assertEquals("administrative state should be UNLOCKED", - AdministrativeState.UNLOCKED, node.getAdministrativeState()); - assertEquals("life-cycle state should be INSTALLED", LifecycleState.INSTALLED, node.getLifecycleState()); - assertEquals("operational state should be ENABLED", OperationalState.ENABLED, node.getOperationalState()); - assertEquals("value-name should be 'dsr/odu node name'", - "dsr/odu node name", node.nonnullName().values().stream().findFirst().get().getValueName()); - assertEquals("dsr node should manage 2 protocol layers : dsr and odu", - 2, node.getLayerProtocolName().size()); + Uuid nodeUuid, String dsrNodeType, String nodeId) { + assertEquals(nodeUuid, node.getUuid(), "incorrect node uuid"); + assertEquals(nodeId + "+DSR", node.getName().get(new NameKey("dsr/odu node name")).getValue(), + "incorrect node name"); + assertEquals(AdministrativeState.UNLOCKED, node.getAdministrativeState(), + "administrative state should be UNLOCKED"); + assertEquals(LifecycleState.INSTALLED, node.getLifecycleState(), "life-cycle state should be INSTALLED"); + assertEquals(OperationalState.ENABLED, node.getOperationalState(), "operational state should be ENABLED"); + assertThat("one value-name should be 'dsr/odu node name'", + new ArrayList<>(node.nonnullName().keySet()), hasItem(new NameKey("dsr/odu node name"))); + assertEquals(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)); List inepsN = node.nonnullOwnedNodeEdgePoint().values().stream() @@ -894,9 +624,9 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { .filter(n -> n.getName().containsKey(new NameKey("NodeEdgePoint_C"))) .sorted((nep1, nep2) -> nep1.getUuid().getValue().compareTo(nep2.getUuid().getValue())) .collect(Collectors.toList()); - assertEquals("Switch-DSR node should have 4 eNEPs network", 4, enepsN.size()); - assertEquals("Switch-DSR node should have 4 iNEPs network", 4, inepsN.size()); - assertEquals("Switch-DSR node should have 4 NEPs client", 4, nepsC.size()); + assertEquals(4, enepsN.size(), "Switch-DSR node should have 4 eNEPs network"); + assertEquals(4, inepsN.size(), "Switch-DSR node should have 4 iNEPs network"); + assertEquals(4, nepsC.size(), "Switch-DSR node should have 4 NEPs client"); OwnedNodeEdgePoint nep1 = nepsC.get(2); Uuid client4NepUuid = new Uuid( UUID.nameUUIDFromBytes((nodeId + "+DSR+XPDR2-CLIENT4").getBytes(Charset.forName("UTF-8"))) @@ -922,9 +652,9 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { .filter(n -> n.getName().containsKey(new NameKey("NodeEdgePoint_C"))) .sorted((nep3, nep4) -> nep3.getUuid().getValue().compareTo(nep4.getUuid().getValue())) .collect(Collectors.toList()); - assertEquals("Mux-DSR node should have 4 eNEP network", 4, enepsN.size()); - assertEquals("Mux-DSR node should have 1 iNEP network", 1, inepsN.size()); - assertEquals("Mux-DSR node should have 4 NEPs client", 4, nepsC.size()); + assertEquals(4, enepsN.size(), "Mux-DSR node should have 4 eNEP network"); + assertEquals(1, inepsN.size(), "Mux-DSR node should have 1 iNEP network"); + assertEquals(4, nepsC.size(), "Mux-DSR node should have 4 NEPs client"); OwnedNodeEdgePoint nep3 = nepsC.get(2); Uuid client3NepUuid = new Uuid( UUID.nameUUIDFromBytes((nodeId + "+DSR+XPDR1-CLIENT3").getBytes(Charset.forName("UTF-8"))) @@ -951,9 +681,9 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { .filter(n -> n.getName().containsKey(new NameKey("100G-tpdr"))) .sorted((nep5, nep6) -> nep5.getUuid().getValue().compareTo(nep6.getUuid().getValue())) .collect(Collectors.toList()); - assertEquals("Tpdr-DSR node should have 2 eNEPs network", 2, enepsN.size()); - assertEquals("Tpdr-DSR node should have 2 iNEPs network", 2, inepsN.size()); - assertEquals("Tpdr-DSR node should have 2 NEPs client", 2, nepsC.size()); + assertEquals(2, enepsN.size(), "Tpdr-DSR node should have 2 eNEPs network"); + assertEquals(2, inepsN.size(), "Tpdr-DSR node should have 2 iNEPs network"); + assertEquals(2, nepsC.size(), "Tpdr-DSR node should have 2 NEPs client"); OwnedNodeEdgePoint nep5 = nepsC.get(0); Uuid client1NepUuid = new Uuid( UUID.nameUUIDFromBytes((nodeId + "+DSR+XPDR1-CLIENT1").getBytes(Charset.forName("UTF-8"))) @@ -984,7 +714,7 @@ public class ConvertORTopoToFullTapiTopoTest 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) { - assertEquals("incorrect node uuid", nodeUuid, node.getUuid()); + assertEquals(nodeUuid, node.getUuid(), "incorrect node uuid"); List nepsI = null; List nepsE = null; List nepsP = null; @@ -992,10 +722,10 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { List nepsOtsimc = null; List nepsPhot = null; if (!otsiNodeType.equals("roadm")) { - assertEquals("incorrect node name", nodeId + "+OTSi", node.getName().get( - new NameKey("otsi node name")).getValue()); - assertEquals("value-name should be 'dsr/odu node name'", - "otsi node name", node.nonnullName().values().stream().findFirst().get().getValueName()); + assertEquals(nodeId + "+OTSi", node.getName().get(new NameKey("otsi node name")).getValue(), + "incorrect node name"); + assertThat("one value-name should be 'dsr/odu node name'", + new ArrayList<>(node.nonnullName().keySet()), hasItem(new NameKey("otsi node name"))); nepsI = node.nonnullOwnedNodeEdgePoint().values().stream() .filter(n -> n.getName().containsKey(new NameKey("iNodeEdgePoint"))) .sorted((nep1, nep2) -> nep1.getUuid().getValue().compareTo(nep2.getUuid().getValue())) @@ -1009,10 +739,10 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { .sorted((nep1, nep2) -> nep1.getUuid().getValue().compareTo(nep2.getUuid().getValue())) .collect(Collectors.toList()); } else { - assertEquals("incorrect node name", nodeId + "+PHOTONIC_MEDIA", node.getName().get( - new NameKey("roadm node name")).getValue()); - assertEquals("value-name should be 'dsr/odu node name'", - "roadm node name", node.nonnullName().values().stream().findFirst().get().getValueName()); + assertEquals(nodeId + "+PHOTONIC_MEDIA", node.getName().get(new NameKey("roadm node name")).getValue(), + "incorrect node name"); + assertThat("one value-name should be 'dsr/odu node name'", + new ArrayList<>(node.nonnullName().keySet()), hasItem(new NameKey("roadm node name"))); nepsMc = node.nonnullOwnedNodeEdgePoint().values().stream() .filter(n -> n.getName().containsKey(new NameKey("MEDIA_CHANNELNodeEdgePoint"))) .sorted((nep1, nep2) -> nep1.getUuid().getValue().compareTo(nep2.getUuid().getValue())) @@ -1026,20 +756,20 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { .sorted((nep1, nep2) -> nep1.getUuid().getValue().compareTo(nep2.getUuid().getValue())) .collect(Collectors.toList()); } - assertEquals("administrative state should be UNLOCKED", - AdministrativeState.UNLOCKED, node.getAdministrativeState()); - assertEquals("life-cycle state should be INSTALLED", LifecycleState.INSTALLED, node.getLifecycleState()); - assertEquals("operational state should be ENABLED", OperationalState.ENABLED, node.getOperationalState()); - assertEquals("otsi node should manage a single protocol layer : PHOTONIC_MEDIA", - 1, node.getLayerProtocolName().size()); - assertEquals("otsi node should manage a single protocol layer : PHOTONIC_MEDIA", - LayerProtocolName.PHOTONICMEDIA, node.getLayerProtocolName().get(0)); + assertEquals(AdministrativeState.UNLOCKED, node.getAdministrativeState(), + "administrative state should be UNLOCKED"); + assertEquals(LifecycleState.INSTALLED, node.getLifecycleState(), "life-cycle state should be INSTALLED"); + assertEquals(OperationalState.ENABLED, node.getOperationalState(), "operational state should be ENABLED"); + assertEquals(1, node.getLayerProtocolName().size(), + "otsi node should manage a single protocol layer : PHOTONIC_MEDIA"); + assertEquals(LayerProtocolName.PHOTONICMEDIA, node.getLayerProtocolName().stream().findFirst().get(), + "otsi node should manage a single protocol layer : PHOTONIC_MEDIA"); switch (otsiNodeType) { case "switch": - assertEquals("Switch-OTSi node should have 4 eNEPs", 4, nepsE.size()); - assertEquals("Switch-OTSi node should have 4 iNEPs", 4, nepsI.size()); - assertEquals("Switch-OTSi node should have 4 photNEPs", 4, nepsP.size()); + assertEquals(4, nepsE.size(), "Switch-OTSi node should have 4 eNEPs"); + assertEquals(4, nepsI.size(), "Switch-OTSi node should have 4 iNEPs"); + assertEquals(4, nepsP.size(), "Switch-OTSi node should have 4 photNEPs"); OwnedNodeEdgePoint nep1 = nepsI.get(1); Uuid inepUuid = new Uuid( UUID.nameUUIDFromBytes((nodeId + "+iOTSi+XPDR2-NETWORK2").getBytes(Charset.forName("UTF-8"))) @@ -1062,9 +792,9 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { checkNodeRuleGroupForSwitchOTSi(nrgList, enepUuid, inepUuid, nodeUuid); break; case "mux": - assertEquals("Mux-OTSi node should have 1 eNEP", 1, nepsE.size()); - assertEquals("Mux-OTSi node should have 1 iNEPs", 1, nepsI.size()); - assertEquals("Mux-OTSi node should have 1 photNEPs", 1, nepsP.size()); + assertEquals(1, nepsE.size(), "Mux-OTSi node should have 1 eNEP"); + assertEquals(1, nepsI.size(), "Mux-OTSi node should have 1 iNEPs"); + assertEquals(1, nepsP.size(), "Mux-OTSi node should have 1 photNEPs"); OwnedNodeEdgePoint nep3 = nepsE.get(0); Uuid enepUuid2 = new Uuid( UUID.nameUUIDFromBytes((nodeId + "+eOTSi+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) @@ -1087,9 +817,9 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { checkNodeRuleGroupForMuxOTSi(nrgList2, enepUuid2, inepUuid2, nodeUuid); break; case "tpdr": - assertEquals("Tpdr-OTSi node should have 2 eNEPs", 2, nepsE.size()); - assertEquals("Tpdr-OTSi node should have 2 iNEPs", 2, nepsI.size()); - assertEquals("Tpdr-OTSi node should have 2 photNEPs", 2, nepsP.size()); + assertEquals(2, nepsE.size(), "Tpdr-OTSi node should have 2 eNEPs"); + assertEquals(2, nepsI.size(), "Tpdr-OTSi node should have 2 iNEPs"); + assertEquals(2, nepsP.size(), "Tpdr-OTSi node should have 2 photNEPs"); OwnedNodeEdgePoint nep5 = nepsE.get(0); Uuid enepUuid3 = new Uuid( UUID.nameUUIDFromBytes((nodeId + "+eOTSi+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) @@ -1112,9 +842,9 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { checkNodeRuleGroupForTpdrOTSi(nrgList3, enepUuid3, inepUuid3, nodeUuid); break; case "roadm": - assertEquals("Roadm node should have 10 MC NEPs", 10, nepsMc.size()); - assertEquals("Roadm node should have 10 OTSiMC NEPs", 10, nepsOtsimc.size()); - assertEquals("Roadm node should have 10 PHOT_MEDIA NEPs", 10, nepsPhot.size()); + assertEquals(10, nepsMc.size(), "Roadm node should have 10 MC NEPs"); + assertEquals(10, nepsOtsimc.size(), "Roadm node should have 10 OTSiMC NEPs"); + assertEquals(10, nepsPhot.size(), "Roadm node should have 10 PHOT_MEDIA NEPs"); // For Degree node OwnedNodeEdgePoint nep7 = nepsMc.get(6); Uuid mcnepUuid3 = new Uuid( @@ -1161,66 +891,62 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { } private void checkNepClient10G(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName) { - assertEquals("bad uuid for " + portName, nepUuid, nep.getUuid()); + assertEquals(nepUuid, nep.getUuid(), "bad uuid for " + portName); List nameList = new ArrayList<>(nep.nonnullName().values()); Name name = nameList.get(0); - assertEquals("value of client nep should be '" + portName + "'", - portName, name.getValue()); - assertEquals("value-name of client nep for '" + portName + "' should be '" + nepName + "'", - nepName, name.getValueName()); - assertEquals("Client nep should support 3 kind of cep", - 3, nep.getSupportedCepLayerProtocolQualifier().size()); + assertEquals(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(), - hasItems(ODUTYPEODU2.class, ODUTYPEODU2E.class, DIGITALSIGNALTYPE10GigELAN.class)); - assertEquals("client nep should be of DSR protocol type", LayerProtocolName.DSR, nep.getLayerProtocolName()); + hasItems(ODUTYPEODU2.VALUE, ODUTYPEODU2E.VALUE, DIGITALSIGNALTYPE10GigELAN.VALUE)); + assertEquals(LayerProtocolName.DSR, nep.getLayerProtocolName(), "client nep should be of DSR protocol type"); checkCommonPartOfNep(nep, false); } private void checkNepeODU4(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName, - boolean withSip) { - assertEquals("bad uuid for " + portName, nepUuid, nep.getUuid()); + boolean withSip) { + assertEquals(nepUuid, nep.getUuid(), "bad uuid for " + portName); List nameList = new ArrayList<>(nep.nonnullName().values()); Name name = nameList.get(0); - assertEquals("value of eODU nep should be '" + portName + "'", - portName, name.getValue()); - assertEquals("value-name of eODU nep for '" + portName + "' should be '" + nepName + "'", - nepName, name.getValueName()); + assertEquals(portName, name.getValue(), "value of eODU nep should be '" + portName + "'"); + assertEquals(nepName, name.getValueName(), + "value-name of eODU nep for '" + portName + "' should be '" + nepName + "'"); // TODO: depending on the type of node there is one type or another assertThat("eODU nep should support 1, 2 or 3 kind of cep, depending on client port", nep.getSupportedCepLayerProtocolQualifier().size(), anyOf(is(1), is(2), is(3))); - assertTrue("eODU nep should support 1 kind of cep", - nep.getSupportedCepLayerProtocolQualifier().stream().anyMatch(splc -> splc.equals(ODUTYPEODU0.class) - || splc.equals(ODUTYPEODU2.class) || splc.equals(ODUTYPEODU2E.class) - || splc.equals(ODUTYPEODU4.class))); - assertEquals("eODU nep should be of ODU protocol type", LayerProtocolName.ODU, nep.getLayerProtocolName()); + assertTrue( + nep.getSupportedCepLayerProtocolQualifier().stream().anyMatch(splc -> splc.equals(ODUTYPEODU0.VALUE) + || splc.equals(ODUTYPEODU2.VALUE) || splc.equals(ODUTYPEODU2E.VALUE) + || splc.equals(ODUTYPEODU4.VALUE)), + "eODU nep should support 1 kind of cep"); + assertEquals(LayerProtocolName.ODU, nep.getLayerProtocolName(), "eODU nep should be of ODU protocol type"); checkCommonPartOfNep(nep, withSip); } private void checkNepNetworkODU4(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName, - boolean withSip) { - assertEquals("bad uuid for " + portName, nepUuid, nep.getUuid()); + boolean withSip) { + assertEquals(nepUuid, nep.getUuid(), "bad uuid for " + portName); List nameList = new ArrayList<>(nep.nonnullName().values()); Name name = nameList.get(0); - assertEquals("value of network nep should be '" + portName + "'", - portName, name.getValue()); - assertEquals("value-name of network nep for '" + portName + "' should be '" + nepName + "'", - nepName, name.getValueName()); - assertEquals("Network nep should support 1 kind of cep", - 1, nep.getSupportedCepLayerProtocolQualifier().size()); + assertEquals(portName, name.getValue(), "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.class)); - assertEquals("network nep should be of ODU protocol type", LayerProtocolName.ODU, nep.getLayerProtocolName()); + hasItem(ODUTYPEODU4.VALUE)); + assertEquals(LayerProtocolName.ODU, nep.getLayerProtocolName(), "network nep should be of ODU protocol type"); checkCommonPartOfNep(nep, withSip); } private void checkNodeRuleGroupForTpdrDSR(List nrgList, Uuid clientNepUuid, Uuid networkNepUuid, - Uuid nodeUuid) { - assertEquals("transponder DSR should contain 2 node rule group", 2, nrgList.size()); + Uuid nodeUuid) { + assertEquals(2, nrgList.size(), "transponder DSR should contain 2 node rule group"); for (NodeRuleGroup nodeRuleGroup : nrgList) { - assertEquals("each node-rule-group should contain 2 NEP for transponder DSR", - 2, nodeRuleGroup.getNodeEdgePoint().size()); + assertEquals(2, nodeRuleGroup.getNodeEdgePoint().size(), + "each node-rule-group should contain 2 NEP for transponder DSR"); } List nodeEdgePointList = new ArrayList<>(nrgList.get(0).nonnullNodeEdgePoint().values()); assertThat("node-rule-group nb 1 should be between nep-client1 and nep-network1", @@ -1229,26 +955,24 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { assertThat("node-rule-group nb 1 should be between nep-client1 and nep-network1", nodeEdgePointList.get(1).getNodeEdgePointUuid().getValue(), either(containsString(networkNepUuid.getValue())).or(containsString(clientNepUuid.getValue()))); - assertEquals("node-rule-group nb 1 should be between nep-client1 and nep-network1 of the same node", - nodeEdgePointList.get(0).getNodeUuid(), nodeUuid); - assertEquals("node-rule-group nb 1 should be between nep-client1 and nep-network1 of the same node", - nodeEdgePointList.get(1).getNodeUuid(), nodeUuid); + assertEquals(nodeEdgePointList.get(0).getNodeUuid(), nodeUuid, + "node-rule-group nb 1 should be between nep-client1 and nep-network1 of the same node"); + assertEquals(nodeEdgePointList.get(1).getNodeUuid(), nodeUuid, + "node-rule-group nb 1 should be between nep-client1 and nep-network1 of the same node"); List rule = new ArrayList<>(nrgList.get(1).nonnullRule().values()); - assertEquals("node-rule-group nb 1 should contain a single rule", 1, rule.size()); - assertEquals("local-id of the rule should be 'forward'", - "forward", rule.get(0).getLocalId()); - assertEquals("the forwarding rule should be 'MAYFORWARDACROSSGROUP'", - ForwardingRule.MAYFORWARDACROSSGROUP, rule.get(0).getForwardingRule()); - assertEquals("the rule type should be 'FORWARDING'", - RuleType.FORWARDING, rule.get(0).getRuleType()); + assertEquals(1, rule.size(), "node-rule-group nb 1 should contain a single rule"); + assertEquals("forward", rule.get(0).getLocalId(), "local-id of the rule should be 'forward'"); + assertEquals(ForwardingRule.MAYFORWARDACROSSGROUP, rule.get(0).getForwardingRule(), + "the forwarding rule should be 'MAYFORWARDACROSSGROUP'"); + assertEquals(RuleType.FORWARDING, rule.get(0).getRuleType(), "the rule type should be 'FORWARDING'"); } private void checkNodeRuleGroupForMuxDSR(List nrgList, Uuid clientNepUuid, Uuid networkNepUuid, - Uuid nodeUuid) { - assertEquals("muxponder DSR should contain 4 node rule group", 4, nrgList.size()); + Uuid nodeUuid) { + assertEquals(4, nrgList.size(), "muxponder DSR should contain 4 node rule group"); for (NodeRuleGroup nodeRuleGroup : nrgList) { - assertEquals("each node-rule-group should contain 2 NEP for muxponder DSR", - 2, nodeRuleGroup.getNodeEdgePoint().size()); + assertEquals(2, nodeRuleGroup.getNodeEdgePoint().size(), + "each node-rule-group should contain 2 NEP for muxponder DSR"); } List nodeEdgePointList = new ArrayList<>(nrgList.get(2).nonnullNodeEdgePoint().values()); assertThat("node-rule-group nb 2 should be between nep-client4 and nep-network1", @@ -1257,122 +981,112 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { assertThat("node-rule-group nb 2 should be between nep-client4 and nep-network1", nodeEdgePointList.get(1).getNodeEdgePointUuid().getValue(), either(containsString(networkNepUuid.getValue())).or(containsString(clientNepUuid.getValue()))); - assertEquals("node-rule-group nb 2 should be between nep-client4 and nep-network1 of the same node", - nodeEdgePointList.get(0).getNodeUuid(), nodeUuid); - assertEquals("node-rule-group nb 2 should be between nep-client4 and nep-network1 of the same node", - nodeEdgePointList.get(1).getNodeUuid(), nodeUuid); + assertEquals(nodeEdgePointList.get(0).getNodeUuid(), nodeUuid, + "node-rule-group nb 2 should be between nep-client4 and nep-network1 of the same node"); + assertEquals(nodeEdgePointList.get(1).getNodeUuid(), nodeUuid, + "node-rule-group nb 2 should be between nep-client4 and nep-network1 of the same node"); List rule = new ArrayList<>(nrgList.get(1).nonnullRule().values()); - assertEquals("node-rule-group nb 2 should contain a single rule", 1, rule.size()); - assertEquals("local-id of the rule should be 'forward'", - "forward", rule.get(0).getLocalId()); - assertEquals("the forwarding rule should be 'MAYFORWARDACROSSGROUP'", - ForwardingRule.MAYFORWARDACROSSGROUP, rule.get(0).getForwardingRule()); - assertEquals("the rule type should be 'FORWARDING'", - RuleType.FORWARDING, rule.get(0).getRuleType()); + assertEquals(1, rule.size(), "node-rule-group nb 2 should contain a single rule"); + assertEquals("forward", rule.get(0).getLocalId(), "local-id of the rule should be 'forward'"); + assertEquals(ForwardingRule.MAYFORWARDACROSSGROUP, rule.get(0).getForwardingRule(), + "the forwarding rule should be 'MAYFORWARDACROSSGROUP'"); + assertEquals(RuleType.FORWARDING, rule.get(0).getRuleType(), "the rule type should be 'FORWARDING'"); } private void checkNodeRuleGroupForSwitchDSR(List nrgList, Uuid clientNepUuid, Uuid networkNepUuid, - Uuid nodeUuid) { - assertEquals("Switch-DSR should contain a single node rule group", 1, nrgList.size()); - assertEquals("Switch-DSR node-rule-group should contain 8 NEP", 8, nrgList.get(0).getNodeEdgePoint().size()); + Uuid nodeUuid) { + assertEquals(1, nrgList.size(), "Switch-DSR should contain a single node rule group"); + assertEquals(8, nrgList.get(0).getNodeEdgePoint().size(), "Switch-DSR node-rule-group should contain 8 NEP"); List nrg = nrgList.get(0).nonnullNodeEdgePoint().values().stream() .sorted((nrg1, nrg2) -> nrg1.getNodeEdgePointUuid().getValue() .compareTo(nrg2.getNodeEdgePointUuid().getValue())) .collect(Collectors.toList()); - assertEquals("in the sorted node-rule-group, nep number 7 should be XPDR2-NETWORK1", - networkNepUuid, nrg.get(6).getNodeEdgePointUuid()); - assertEquals("in the sorted node-rule-group, nep number 4 should be XPDR2-CLIENT4", - clientNepUuid, nrg.get(3).getNodeEdgePointUuid()); - assertEquals("any item of the node-rule-group should have the same nodeUuid", - nodeUuid, nrg.get(4).getNodeUuid()); - assertEquals("any item of the node-rule-group should have the same nodeUuid", - nodeUuid, nrg.get(3).getNodeUuid()); + assertEquals(networkNepUuid, nrg.get(6).getNodeEdgePointUuid(), + "in the sorted node-rule-group, nep number 7 should be XPDR2-NETWORK1"); + assertEquals(clientNepUuid, nrg.get(3).getNodeEdgePointUuid(), + "in the sorted node-rule-group, nep number 4 should be XPDR2-CLIENT4"); + assertEquals(nodeUuid, nrg.get(4).getNodeUuid(), + "any item of the node-rule-group should have the same nodeUuid"); + assertEquals(nodeUuid, nrg.get(3).getNodeUuid(), + "any item of the node-rule-group should have the same nodeUuid"); @Nullable List ruleList = new ArrayList<>(nrgList.get(0).nonnullRule().values()); - assertEquals("node-rule-group should contain a single rule", 1, ruleList.size()); - assertEquals("local-id of the rule should be 'forward'", - "forward", ruleList.get(0).getLocalId()); - assertEquals("the forwarding rule should be 'MAYFORWARDACROSSGROUP'", - ForwardingRule.MAYFORWARDACROSSGROUP, ruleList.get(0).getForwardingRule()); - assertEquals("the rule type should be 'FORWARDING'", - RuleType.FORWARDING, ruleList.get(0).getRuleType()); + assertEquals(1, ruleList.size(), "node-rule-group should contain a single rule"); + assertEquals("forward", ruleList.get(0).getLocalId(), "local-id of the rule should be 'forward'"); + assertEquals(ForwardingRule.MAYFORWARDACROSSGROUP, ruleList.get(0).getForwardingRule(), + "the forwarding rule should be 'MAYFORWARDACROSSGROUP'"); + assertEquals(RuleType.FORWARDING, ruleList.get(0).getRuleType(), "the rule type should be 'FORWARDING'"); } private void checkNodeRuleGroupForRdm(List nrgList, int nbNeps) { - assertEquals("RDM infra node - OTSi should contain a single node rule groups", 1, nrgList.size()); + assertEquals(1, nrgList.size(), "RDM infra node - OTSi should contain a single node rule groups"); if (nbNeps > 0) { List nodeEdgePointList = new ArrayList<>(nrgList.get(0).getNodeEdgePoint().values()); - assertEquals("RDM infra node -rule-group should contain " + nbNeps + " NEP", - nbNeps, nodeEdgePointList.size()); + assertEquals(nbNeps, nodeEdgePointList.size(), + "RDM infra node -rule-group should contain " + nbNeps + " NEP"); } else { - assertNull("RDM infra node -rule-group should contain no NEP", nrgList.get(0).getNodeEdgePoint()); + assertNull(nrgList.get(0).getNodeEdgePoint(), "RDM infra node -rule-group should contain no NEP"); } List ruleList = new ArrayList<>(nrgList.get(0).nonnullRule().values()); - assertEquals("node-rule-group should contain a single rule", 1, ruleList.size()); - assertEquals("local-id of the rule should be 'forward'", - "forward", ruleList.get(0).getLocalId()); - assertEquals("the forwarding rule should be 'MAYFORWARDACROSSGROUP'", - ForwardingRule.MAYFORWARDACROSSGROUP, ruleList.get(0).getForwardingRule()); - assertEquals("the rule type should be 'FORWARDING'", - RuleType.FORWARDING, ruleList.get(0).getRuleType()); + assertEquals(1, ruleList.size(), "node-rule-group should contain a single rule"); + assertEquals("forward", ruleList.get(0).getLocalId(), "local-id of the rule should be 'forward'"); + assertEquals(ForwardingRule.MAYFORWARDACROSSGROUP, ruleList.get(0).getForwardingRule(), + "the forwarding rule should be 'MAYFORWARDACROSSGROUP'"); + assertEquals(RuleType.FORWARDING, ruleList.get(0).getRuleType(), "the rule type should be 'FORWARDING'"); } private void checkNodeRuleGroupForTpdrOTSi(List nrgList, Uuid enepUuid, Uuid inepUuid, - Uuid nodeUuid) { - assertEquals("Tpdr-OTSi should contain two node rule groups", 2, nrgList.size()); + Uuid nodeUuid) { + assertEquals(2, nrgList.size(), "Tpdr-OTSi should contain two node rule groups"); List nodeEdgePointList = new ArrayList<>(nrgList.get(0).getNodeEdgePoint().values()); - assertEquals("Tpdr-OTSi node-rule-group should contain 2 NEP", 2, nodeEdgePointList.size()); + assertEquals(2, nodeEdgePointList.size(), "Tpdr-OTSi node-rule-group should contain 2 NEP"); assertThat("Tpdr-OTSi node-rule-group should be between eNEP and iNEP of XPDR1-NETWORK1", nodeEdgePointList.get(0).getNodeEdgePointUuid().getValue(), either(containsString(enepUuid.getValue())).or(containsString(inepUuid.getValue()))); assertThat("Tpdr-OTSi node-rule-group should be between eNEP and iNEP of XPDR1-NETWORK1", nodeEdgePointList.get(1).getNodeEdgePointUuid().getValue(), either(containsString(enepUuid.getValue())).or(containsString(inepUuid.getValue()))); - assertEquals("any item of the node-rule-group should have the same nodeUuid", - nodeUuid, nodeEdgePointList.get(0).getNodeUuid()); - assertEquals("any item of the node-rule-group should have the same nodeUuid", - nodeUuid, nodeEdgePointList.get(1).getNodeUuid()); + assertEquals(nodeUuid, nodeEdgePointList.get(0).getNodeUuid(), + "any item of the node-rule-group should have the same nodeUuid"); + assertEquals(nodeUuid, nodeEdgePointList.get(1).getNodeUuid(), + "any item of the node-rule-group should have the same nodeUuid"); List ruleList = new ArrayList<>(nrgList.get(0).nonnullRule().values()); - assertEquals("node-rule-group should contain a single rule", 1, ruleList.size()); - assertEquals("local-id of the rule should be 'forward'", - "forward", ruleList.get(0).getLocalId()); - assertEquals("the forwarding rule should be 'MAYFORWARDACROSSGROUP'", - ForwardingRule.MAYFORWARDACROSSGROUP, ruleList.get(0).getForwardingRule()); - assertEquals("the rule type should be 'FORWARDING'", - RuleType.FORWARDING, ruleList.get(0).getRuleType()); + assertEquals(1, ruleList.size(), "node-rule-group should contain a single rule"); + assertEquals("forward", ruleList.get(0).getLocalId(), "local-id of the rule should be 'forward'"); + assertEquals(ForwardingRule.MAYFORWARDACROSSGROUP, ruleList.get(0).getForwardingRule(), + "the forwarding rule should be 'MAYFORWARDACROSSGROUP'"); + assertEquals(RuleType.FORWARDING, ruleList.get(0).getRuleType(), "the rule type should be 'FORWARDING'"); } private void checkNodeRuleGroupForMuxOTSi(List nrgList, Uuid enepUuid, Uuid inepUuid, - Uuid nodeUuid) { - assertEquals("Mux-OTSi should contain a single node rule group", 1, nrgList.size()); + Uuid nodeUuid) { + assertEquals(1, nrgList.size(), "Mux-OTSi should contain a single node rule group"); List nodeEdgePointList = new ArrayList<>(nrgList.get(0).getNodeEdgePoint().values()); - assertEquals("Mux-OTSi node-rule-group should contain 2 NEP", 2, nodeEdgePointList.size()); + assertEquals(2, nodeEdgePointList.size(), "Mux-OTSi node-rule-group should contain 2 NEP"); assertThat("Mux-OTSi node-rule-group should be between eNEP and iNEP of XPDR1-NETWORK1", nodeEdgePointList.get(0).getNodeEdgePointUuid().getValue(), either(containsString(enepUuid.getValue())).or(containsString(inepUuid.getValue()))); assertThat("Mux-OTSi node-rule-group should be between eNEP and iNEP of XPDR1-NETWORK1", nodeEdgePointList.get(1).getNodeEdgePointUuid().getValue(), either(containsString(enepUuid.getValue())).or(containsString(inepUuid.getValue()))); - assertEquals("any item of the node-rule-group should have the same nodeUuid", - nodeUuid, nodeEdgePointList.get(0).getNodeUuid()); - assertEquals("any item of the node-rule-group should have the same nodeUuid", - nodeUuid, nodeEdgePointList.get(1).getNodeUuid()); + assertEquals(nodeUuid, nodeEdgePointList.get(0).getNodeUuid(), + "any item of the node-rule-group should have the same nodeUuid"); + assertEquals(nodeUuid, nodeEdgePointList.get(1).getNodeUuid(), + "any item of the node-rule-group should have the same nodeUuid"); List ruleList = new ArrayList<>(nrgList.get(0).nonnullRule().values()); - assertEquals("node-rule-group should contain a single rule", 1, ruleList.size()); - assertEquals("local-id of the rule should be 'forward'", - "forward", ruleList.get(0).getLocalId()); - assertEquals("the forwarding rule should be 'MAYFORWARDACROSSGROUP'", - ForwardingRule.MAYFORWARDACROSSGROUP, ruleList.get(0).getForwardingRule()); - assertEquals("the rule type should be 'FORWARDING'", - RuleType.FORWARDING, ruleList.get(0).getRuleType()); + assertEquals(1, ruleList.size(), "node-rule-group should contain a single rule"); + assertEquals("forward", ruleList.get(0).getLocalId(), "local-id of the rule should be 'forward'"); + assertEquals(ForwardingRule.MAYFORWARDACROSSGROUP, ruleList.get(0).getForwardingRule(), + "the forwarding rule should be 'MAYFORWARDACROSSGROUP'"); + assertEquals(RuleType.FORWARDING, ruleList.get(0).getRuleType(), "the rule type should be 'FORWARDING'"); } private void checkNodeRuleGroupForSwitchOTSi(List nrgList, Uuid enepUuid, Uuid inepUuid, - Uuid nodeUuid) { - assertEquals("Switch-OTSi should contain 4 node rule group", 4, nrgList.size()); + Uuid nodeUuid) { + assertEquals(4, nrgList.size(), "Switch-OTSi should contain 4 node rule group"); for (NodeRuleGroup nodeRuleGroup : nrgList) { - assertEquals("each node-rule-group should contain 2 NEP for Switch-OTSi", - 2, nodeRuleGroup.getNodeEdgePoint().size()); + assertEquals(2, nodeRuleGroup.getNodeEdgePoint().size(), + "each node-rule-group should contain 2 NEP for Switch-OTSi"); } List nodeEdgePointList1 = new ArrayList<>(nrgList.get(3).nonnullNodeEdgePoint().values()); assertThat("Switch-OTSi node-rule-group nb 4 should be between eNEP and iNEP of XPDR2-NETWORK2", @@ -1382,130 +1096,123 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { nodeEdgePointList1.get(1).getNodeEdgePointUuid().getValue(), either(containsString(enepUuid.getValue())).or(containsString(inepUuid.getValue()))); List nodeEdgePointList0 = new ArrayList<>(nrgList.get(0).getNodeEdgePoint().values()); - assertEquals("any item of the node-rule-group should have the same nodeUuid", - nodeUuid, nodeEdgePointList0.get(0).getNodeUuid()); - assertEquals("any item of the node-rule-group should have the same nodeUuid", - nodeUuid, nodeEdgePointList0.get(1).getNodeUuid()); + assertEquals(nodeUuid, nodeEdgePointList0.get(0).getNodeUuid(), + "any item of the node-rule-group should have the same nodeUuid"); + assertEquals(nodeUuid, nodeEdgePointList0.get(1).getNodeUuid(), + "any item of the node-rule-group should have the same nodeUuid"); List ruleList0 = new ArrayList<>(nrgList.get(0).nonnullRule().values()); - assertEquals("node-rule-group should contain a single rule", 1, ruleList0.size()); - assertEquals("local-id of the rule should be 'forward'", - "forward", ruleList0.get(0).getLocalId()); - assertEquals("the forwarding rule should be 'MAYFORWARDACROSSGROUP'", - ForwardingRule.MAYFORWARDACROSSGROUP, ruleList0.get(0).getForwardingRule()); - assertEquals("the rule type should be 'FORWARDING'", - RuleType.FORWARDING, ruleList0.get(0).getRuleType()); + assertEquals(1, ruleList0.size(), "node-rule-group should contain a single rule"); + assertEquals("forward", ruleList0.get(0).getLocalId(), "local-id of the rule should be 'forward'"); + assertEquals(ForwardingRule.MAYFORWARDACROSSGROUP, ruleList0.get(0).getForwardingRule(), + "the forwarding rule should be 'MAYFORWARDACROSSGROUP'"); + assertEquals(RuleType.FORWARDING, ruleList0.get(0).getRuleType(), "the rule type should be 'FORWARDING'"); } private void checkNepClient100GSwitch(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName) { - assertEquals("bad uuid for " + portName, nepUuid, nep.getUuid()); + assertEquals(nepUuid, nep.getUuid(), "bad uuid for " + portName); List nameList = new ArrayList<>(nep.nonnullName().values()); - assertEquals("value of client nep should be '" + portName + "'", - portName, nameList.get(0).getValue()); - assertEquals("value-name of client nep for '" + portName + "' should be '" + nepName + "'", - nepName, nameList.get(0).getValueName()); - assertEquals("Client nep should support 2 kind of cep", - 2, nep.getSupportedCepLayerProtocolQualifier().size()); + assertEquals(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(), - hasItems(ODUTYPEODU4.class, DIGITALSIGNALTYPE100GigE.class)); - assertEquals("client nep should be of DSR protocol type", LayerProtocolName.DSR, nep.getLayerProtocolName()); + hasItems(ODUTYPEODU4.VALUE, DIGITALSIGNALTYPE100GigE.VALUE)); + assertEquals(LayerProtocolName.DSR, nep.getLayerProtocolName(), "client nep should be of DSR protocol type"); checkCommonPartOfNep(nep, false); } private void checkNepClient100GTpdr(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName) { - assertEquals("bad uuid for " + portName, nepUuid, nep.getUuid()); + assertEquals(nepUuid, nep.getUuid(), "bad uuid for " + portName); List nameList = new ArrayList<>(nep.nonnullName().values()); - assertEquals("value of client nep should be '" + portName + "'", - portName, nameList.get(0).getValue()); - assertEquals("value-name of client nep for '" + portName + "' should be 100G-tpdr'", - nepName, nameList.get(0).getValueName()); - assertEquals("Client nep should support 1 kind of cep", - 1, nep.getSupportedCepLayerProtocolQualifier().size()); + assertEquals(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.class)); - assertEquals("client nep should be of DSR protocol type", LayerProtocolName.DSR, nep.getLayerProtocolName()); + hasItems(DIGITALSIGNALTYPE100GigE.VALUE)); + assertEquals(LayerProtocolName.DSR, nep.getLayerProtocolName(), "client nep should be of DSR protocol type"); checkCommonPartOfNep(nep, false); } private void checkNepOtsiNode(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName, - boolean withSip) { - assertEquals("bad uuid for " + portName, nepUuid, nep.getUuid()); + boolean withSip) { + assertEquals(nepUuid, nep.getUuid(), "bad uuid for " + portName); List nameList = new ArrayList<>(nep.nonnullName().values()); - assertEquals("value of OTSi nep should be '" + portName + "'", - portName, nameList.get(0).getValue()); - assertEquals("value-name of OTSi nep should be '" + nepName + "'", - nepName, nameList.get(0).getValueName()); - assertEquals("OTSi nep should support 2 kind of cep", - 2, nep.getSupportedCepLayerProtocolQualifier().size()); + 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(2, nep.getSupportedCepLayerProtocolQualifier().size(), + "OTSi nep should support 2 kind of cep"); assertThat("OTSi nep should support 2 kind of cep", nep.getSupportedCepLayerProtocolQualifier(), - hasItems(PHOTONICLAYERQUALIFIEROMS.class, PHOTONICLAYERQUALIFIEROTSi.class)); - assertEquals("OTSi nep should be of PHOTONIC_MEDIA protocol type", - LayerProtocolName.PHOTONICMEDIA, nep.getLayerProtocolName()); + hasItems(PHOTONICLAYERQUALIFIEROMS.VALUE, PHOTONICLAYERQUALIFIEROTSi.VALUE)); + assertEquals(LayerProtocolName.PHOTONICMEDIA, nep.getLayerProtocolName(), + "OTSi nep should be of PHOTONIC_MEDIA protocol type"); checkCommonPartOfNep(nep, withSip); } private void checkNepOtsiRdmNode(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName, - boolean withSip) { - assertEquals("bad uuid for " + portName, nepUuid, nep.getUuid()); + boolean withSip) { + assertEquals(nepUuid, nep.getUuid(), "bad uuid for " + portName); List nameList = new ArrayList<>(nep.nonnullName().values()); - assertEquals("value of OTSi nep should be '" + portName + "'", - portName, nameList.get(0).getValue()); - assertEquals("value-name of OTSi nep should be '" + nepName + "'", - nepName, nameList.get(0).getValueName()); - assertEquals("OTSi nep of RDM infra node should support only 1 kind of cep", - 1, nep.getSupportedCepLayerProtocolQualifier().size()); + 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.class)); - assertEquals("OTSi nep should be of PHOTONIC_MEDIA protocol type", - LayerProtocolName.PHOTONICMEDIA, nep.getLayerProtocolName()); + hasItems(PHOTONICLAYERQUALIFIEROMS.VALUE)); + assertEquals(LayerProtocolName.PHOTONICMEDIA, nep.getLayerProtocolName(), + "OTSi nep should be of PHOTONIC_MEDIA protocol type"); checkCommonPartOfNep(nep, withSip); } private void checkCommonPartOfNep(OwnedNodeEdgePoint nep, boolean withSip) { - assertEquals("link port direction should be DIRECTIONAL", - PortDirection.BIDIRECTIONAL, nep.getLinkPortDirection()); - assertEquals("administrative state should be UNLOCKED", - AdministrativeState.UNLOCKED, nep.getAdministrativeState()); - assertEquals("termination state should be TERMINATED BIDIRECTIONAL", - TerminationState.TERMINATEDBIDIRECTIONAL, nep.getTerminationState()); - assertEquals("life-cycle state should be INSTALLED", LifecycleState.INSTALLED, nep.getLifecycleState()); + assertEquals(PortDirection.BIDIRECTIONAL, nep.getLinkPortDirection(), + "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"); + assertEquals(LifecycleState.INSTALLED, nep.getLifecycleState(), "life-cycle state should be INSTALLED"); if (withSip) { - assertEquals("Given nep should support 1 SIP", 1, nep.getMappedServiceInterfacePoint().size()); + assertEquals(1, nep.getMappedServiceInterfacePoint().size(), "Given nep should support 1 SIP"); } - assertEquals("termination direction should be BIDIRECTIONAL", - TerminationDirection.BIDIRECTIONAL, nep.getTerminationDirection()); - assertEquals("operational state of client nep should be ENABLED", - OperationalState.ENABLED, nep.getOperationalState()); - assertEquals("link-port-role of client nep should be SYMMETRIC", - PortRole.SYMMETRIC, nep.getLinkPortRole()); + 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(org.opendaylight.yang.gen.v1 - .urn.onf.otcc.yang.tapi.topology.rev181210.topology.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("bad uuid for link between DSR node " + tp1 + " and iOTSI port " + tp2, linkUuid, link.getUuid()); - assertEquals("Available capacity unit should be GBPS", - CapacityUnit.GBPS, link.getAvailableCapacity().getTotalSize().getUnit()); - assertEquals("Available capacity -total size value should be 100", - Uint64.valueOf(100), link.getAvailableCapacity().getTotalSize().getValue()); - assertEquals("transitional link should be between 2 nodes of protocol layers ODU and PHOTONIC_MEDIA", - 2, link.getTransitionedLayerProtocolName().size()); + private void checkTransitionalLink( + org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.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("transitional link should be BIDIRECTIONAL", - ForwardingDirection.BIDIRECTIONAL, link.getDirection()); + assertEquals(ForwardingDirection.BIDIRECTIONAL, link.getDirection(), + "transitional link should be BIDIRECTIONAL"); List nodeEdgePointList = new ArrayList<>(link.nonnullNodeEdgePoint().values()); - assertEquals("topology uuid should be the same for the two termination point of the link", - topologyUuid, nodeEdgePointList.get(0).getTopologyUuid()); - assertEquals("topology uuid should be the same for the two termination point of the link", - topologyUuid, nodeEdgePointList.get(1).getTopologyUuid()); + 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()))); @@ -1522,76 +1229,22 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { either(containsString(nep1Uuid.getValue())).or(containsString(nep2Uuid.getValue()))); } - private void checkOtnLink(org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Link link, - Uuid node1Uuid, Uuid node2Uuid, Uuid tp1Uuid, Uuid tp2Uuid, Uuid linkUuid, - String linkName) { - assertEquals("bad name for the link", linkName, link.getName().get( - new NameKey("otn link name")).getValue()); - assertEquals("bad uuid for link", linkUuid, link.getUuid()); - assertEquals("Available capacity unit should be MBPS", - CapacityUnit.GBPS, link.getAvailableCapacity().getTotalSize().getUnit()); - String prefix = linkName.split("-")[0]; - if ("OTU4".equals(prefix)) { - assertEquals("Available capacity -total size value should be 0", - Uint64.valueOf(0), link.getAvailableCapacity().getTotalSize().getValue()); - } else if ("ODU4".equals(prefix)) { - assertEquals("Available capacity -total size value should be 100 000", - Uint64.valueOf(100000), link.getAvailableCapacity().getTotalSize().getValue()); - } - assertEquals("Total capacity unit should be GBPS", - CapacityUnit.GBPS, link.getTotalPotentialCapacity().getTotalSize().getUnit()); - assertEquals("Total capacity -total size value should be 100", - Uint64.valueOf(100), link.getTotalPotentialCapacity().getTotalSize().getValue()); - if ("OTU4".equals(prefix)) { - assertEquals("otn link should be between 2 nodes of protocol layers PHOTONIC_MEDIA", - LayerProtocolName.PHOTONICMEDIA.getName(), link.getLayerProtocolName().get(0).getName()); - } else if ("ODU4".equals(prefix)) { - assertEquals("otn link should be between 2 nodes of protocol layers ODU", - LayerProtocolName.ODU.getName(), link.getLayerProtocolName().get(0).getName()); - } - assertEquals("otn tapi link should be BIDIRECTIONAL", - ForwardingDirection.BIDIRECTIONAL, link.getDirection()); - List nodeEdgePointList = new ArrayList<>(link.nonnullNodeEdgePoint().values()); - assertEquals("topology uuid should be the same for the two termination point of the link", - topologyUuid, nodeEdgePointList.get(0).getTopologyUuid()); - assertEquals("topology uuid should be the same for the two termination point of the link", - topologyUuid, nodeEdgePointList.get(1).getTopologyUuid()); - assertThat("otn links should terminate on two distinct nodes", - nodeEdgePointList.get(0).getNodeUuid().getValue(), - either(containsString(node1Uuid.getValue())).or(containsString(node2Uuid.getValue()))); - assertThat("otn links should terminate on two distinct nodes", - nodeEdgePointList.get(1).getNodeUuid().getValue(), - either(containsString(node1Uuid.getValue())).or(containsString(node2Uuid.getValue()))); - assertThat("otn links should terminate on two distinct tps", - nodeEdgePointList.get(0).getNodeEdgePointUuid().getValue(), - either(containsString(tp1Uuid.getValue())).or(containsString(tp2Uuid.getValue()))); - assertThat("otn links should terminate on two distinct tps", - nodeEdgePointList.get(1).getNodeEdgePointUuid().getValue(), - either(containsString(tp1Uuid.getValue())).or(containsString(tp2Uuid.getValue()))); - assertEquals("operational state should be ENABLED", - OperationalState.ENABLED, link.getOperationalState()); - assertEquals("administrative state should be UNLOCKED", - AdministrativeState.UNLOCKED, link.getAdministrativeState()); - } - private void checkOmsLink(org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Link link, - Uuid node1Uuid, Uuid node2Uuid, Uuid tp1Uuid, Uuid tp2Uuid, Uuid linkUuid, - String linkName) { - assertEquals("bad name for the link", linkName, link.getName().get( - new NameKey("OMS link name")).getValue()); - assertEquals("bad uuid for link", linkUuid, link.getUuid()); - assertEquals("oms link should be between 2 nodes of protocol layers PHOTONIC_MEDIA", - LayerProtocolName.PHOTONICMEDIA.getName(), link.getLayerProtocolName().get(0).getName()); - assertEquals("otn tapi link should be BIDIRECTIONAL", - ForwardingDirection.BIDIRECTIONAL, link.getDirection()); + 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"); + assertEquals(linkUuid, link.getUuid(), "bad uuid for link"); + assertEquals( + LayerProtocolName.PHOTONICMEDIA.getName(), + link.getLayerProtocolName().stream().findFirst().get().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()); - assertEquals("oms link should be between 2 neps",2 , nodeEdgePointList.size()); - assertEquals("topology uuid should be the same for the two termination point of the link", - topologyUuid, nodeEdgePointList.get(0).getTopologyUuid()); - assertEquals("topology uuid should be the same for the two termination point of the link", - topologyUuid, nodeEdgePointList.get(1).getTopologyUuid()); + assertEquals(2 , nodeEdgePointList.size(), "oms link should be between 2 neps"); + assertEquals(topologyUuid, nodeEdgePointList.get(0).getTopologyUuid(), + "topology uuid should be the same for the two termination point of the link"); + assertEquals(topologyUuid, nodeEdgePointList.get(1).getTopologyUuid(), + "topology uuid should be the same for the two termination point of the link"); assertThat("oms links should terminate on two distinct nodes", nodeEdgePointList.get(0).getNodeUuid().getValue(), either(containsString(node1Uuid.getValue())).or(containsString(node2Uuid.getValue()))); @@ -1606,24 +1259,25 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { either(containsString(tp1Uuid.getValue())).or(containsString(tp2Uuid.getValue()))); } - private void checkXpdrRdmLink(org.opendaylight.yang.gen.v1.urn - .onf.otcc.yang.tapi.topology.rev181210.topology.Link link, - Uuid node1Uuid, Uuid node2Uuid, Uuid tp1Uuid, Uuid tp2Uuid, Uuid linkUuid, - String linkName) { - assertEquals("bad name for the link", linkName, link.getName().get( - new NameKey("XPDR-RDM link name")).getValue()); - assertEquals("bad uuid for link", linkUuid, link.getUuid()); - assertEquals("oms link should be between 2 nodes of protocol layers PHOTONIC_MEDIA", - LayerProtocolName.PHOTONICMEDIA.getName(), link.getLayerProtocolName().get(0).getName()); - assertEquals("otn tapi link should be BIDIRECTIONAL", - ForwardingDirection.BIDIRECTIONAL, link.getDirection()); + private void checkXpdrRdmLink( + org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Link link, Uuid node1Uuid, + Uuid node2Uuid, Uuid tp1Uuid, Uuid tp2Uuid, Uuid linkUuid, String linkName) { + assertEquals(linkName, link.getName().get(new NameKey("XPDR-RDM 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(), + "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()); - assertEquals("oms link should be between 2 neps",2 , nodeEdgePointList.size()); - assertEquals("topology uuid should be the same for the two termination point of the link", - topologyUuid, nodeEdgePointList.get(0).getTopologyUuid()); - assertEquals("topology uuid should be the same for the two termination point of the link", - topologyUuid, nodeEdgePointList.get(1).getTopologyUuid()); + assertEquals(2 , nodeEdgePointList.size(), "oms link should be between 2 neps"); + assertEquals(topologyUuid, nodeEdgePointList.get(0).getTopologyUuid(), + "topology uuid should be the same for the two termination point of the link"); + assertEquals(topologyUuid, nodeEdgePointList.get(1).getTopologyUuid(), + "topology uuid should be the same for the two termination point of the link"); assertThat("oms links should terminate on two distinct nodes", nodeEdgePointList.get(0).getNodeUuid().getValue(), either(containsString(node1Uuid.getValue())).or(containsString(node2Uuid.getValue()))); @@ -1661,19 +1315,4 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { tpdr1Bldr.setTerminationPoint(tps); return new NodeBuilder(initialNode).addAugmentation(tpdr1Bldr.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) { - 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); - linkBldr.addAugmentation(new Link1Builder(linkBldr.augmentation(Link1.class)) - .setAdministrativeState(admin) - .setOperationalState(oper) - .build()); - return linkBldr.build(); - } -} +} \ No newline at end of file