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=45479177a3936f37cf84861d1841ecdd1f6e38cd;hb=refs%2Fchanges%2F46%2F100646%2F27;hp=6c67a84d3c756fefcc0922490549071f1b45ad80;hpb=88b66915d592d2f1602581bd6991b47b89673f71;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..45479177a 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 @@ -43,14 +43,13 @@ 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 +58,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 +104,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; @@ -145,7 +140,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 +177,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 @@ -403,205 +398,6 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { OperationalState.DISABLED, photnep.getOperationalState()); } - @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() { ConvertORTopoToTapiFullTopo tapiFactory = new ConvertORTopoToTapiFullTopo(topologyUuid, tapiLink); @@ -700,59 +496,6 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { "SPDR-SA1-XPDR2+iODU+XPDR2-NETWORK4", "SPDR-SA1-XPDR2+iOTSi+XPDR2-NETWORK4", "SPDR-SA1-XPDR2"); } - @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() { ConvertORTopoToTapiFullTopo tapiFactory = new ConvertORTopoToTapiFullTopo(topologyUuid, tapiLink); @@ -873,8 +616,8 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { 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()); + assertThat("one value-name should be 'dsr/odu node name'", + new ArrayList<>(node.nonnullName().keySet()), hasItem(new NameKey("dsr/odu node name"))); assertEquals("dsr node should manage 2 protocol layers : dsr and odu", 2, node.getLayerProtocolName().size()); assertThat("dsr node should manage 2 protocol layers : dsr and odu", @@ -994,8 +737,8 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { 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()); + 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())) @@ -1011,8 +754,8 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { } 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()); + 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())) @@ -1033,7 +776,7 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { 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)); + LayerProtocolName.PHOTONICMEDIA, node.getLayerProtocolName().stream().findFirst().get()); switch (otsiNodeType) { case "switch": @@ -1522,58 +1265,6 @@ 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, @@ -1582,7 +1273,8 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { 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()); + LayerProtocolName.PHOTONICMEDIA.getName(), + link.getLayerProtocolName().stream().findFirst().get().getName()); assertEquals("otn tapi link should be BIDIRECTIONAL", ForwardingDirection.BIDIRECTIONAL, link.getDirection()); List