X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=networkmodel%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fnetworkmodel%2Futil%2Ftest%2FNetworkmodelTestUtil.java;h=127200f7625124300695062666bdb75c43dd60ef;hb=67763b4d82e44c68fdbc765cdeec5496ff65b01e;hp=e6bfb808f9182dc3bf8788769e5c02ac444eccb8;hpb=68d00560b21cafc8c1438bdbcde09eeb477c436f;p=transportpce.git diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/test/NetworkmodelTestUtil.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/test/NetworkmodelTestUtil.java index e6bfb808f..127200f76 100644 --- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/test/NetworkmodelTestUtil.java +++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/test/NetworkmodelTestUtil.java @@ -7,37 +7,38 @@ */ package org.opendaylight.transportpce.networkmodel.util.test; -import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import org.opendaylight.transportpce.common.NetworkUtils; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.Nodes; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.NodesBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.Mapping; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.MappingBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.NodeInfoBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1Builder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.NodeTypes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.mapping.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.mapping.MappingBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.mapping.MappingKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.network.NodesBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.network.nodes.NodeInfoBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1Builder; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.PortQual; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.XpdrNodeTypes; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmLinkType; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmTpType; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.xpdr.tp.supported.interfaces.SupportedInterfaceCapability; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.xpdr.tp.supported.interfaces.SupportedInterfaceCapabilityBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev181130.ODTU4TsAllocated; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev181130.ODU4; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.TerminationPoint1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.TerminationPoint1Builder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.networks.network.node.termination.point.TpSupportedInterfaces; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.networks.network.node.termination.point.TpSupportedInterfacesBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.networks.network.node.termination.point.XpdrTpPortConnectionAttributesBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev181019.If100GE; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev181019.IfOCH; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev181019.SupportedIfCapability; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev181130.IfOCHOTU4ODU4; -import org.opendaylight.yang.gen.v1.http.org.openroadm.xponder.rev181130.xpdr.otn.tp.attributes.OdtuTpnPoolBuilder; -import org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.OtnLinkType; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.NodeTypes; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.XpdrNodeTypes; +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.rev200529.xpdr.tp.supported.interfaces.SupportedInterfaceCapability; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.xpdr.tp.supported.interfaces.SupportedInterfaceCapabilityBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.xpdr.tp.supported.interfaces.SupportedInterfaceCapabilityKey; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev200327.ODTU4TsAllocated; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev200327.ODU4; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.TerminationPoint1; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.TerminationPoint1Builder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.networks.network.node.termination.point.TpSupportedInterfaces; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.networks.network.node.termination.point.TpSupportedInterfacesBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.networks.network.node.termination.point.XpdrTpPortConnectionAttributesBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.IfOCHOTU4ODU4; +import org.opendaylight.yang.gen.v1.http.org.openroadm.xponder.rev200529.xpdr.otn.tp.attributes.OdtuTpnPool; +import org.opendaylight.yang.gen.v1.http.org.openroadm.xponder.rev200529.xpdr.otn.tp.attributes.OdtuTpnPoolBuilder; +import org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019.OtnLinkType; 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.NodeId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.LinkId; @@ -50,6 +51,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.top import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPointBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.termination.point.SupportingTerminationPoint; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.termination.point.SupportingTerminationPointBuilder; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.termination.point.SupportingTerminationPointKey; import org.opendaylight.yangtools.yang.common.Uint16; import org.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; @@ -60,7 +62,7 @@ public final class NetworkmodelTestUtil { private static final Logger LOG = LoggerFactory.getLogger(NetworkmodelTestUtil.class); public static Nodes createMappingForRdm(String nodeId, String clli, int degNb, int srgNb) { - List mappingList = new ArrayList<>(); + Map mappingList = new HashMap<>(); createDegreeMappings(mappingList, 1, degNb); createSrgMappings(mappingList, 1, srgNb); Nodes mappingNode = new NodesBuilder() @@ -73,12 +75,12 @@ public final class NetworkmodelTestUtil { public static Nodes createMappingForXpdr(String nodeId, String clli, int networkPortNb, int clientPortNb, XpdrNodeTypes xpdrNodeType) { - List mappingList = new ArrayList<>(); - createXpdrMappings(mappingList, networkPortNb, clientPortNb, xpdrNodeType); + Map mappingMap = new HashMap<>(); + createXpdrMappings(mappingMap, networkPortNb, clientPortNb, xpdrNodeType); Nodes mappingNode = new NodesBuilder() .setNodeId(nodeId) .setNodeInfo(new NodeInfoBuilder().setNodeType(NodeTypes.Xpdr).setNodeClli(clli).build()) - .setMapping(mappingList) + .setMapping(mappingMap) .build(); LOG.info("mapping = {}", mappingNode.toString()); return mappingNode; @@ -100,20 +102,17 @@ public final class NetworkmodelTestUtil { .setDestNode(new NodeId("SPDRZ-XPDR1")) .setDestTp("XPDR1-NETWORK1").build()) .addAugmentation( - Link1.class, new Link1Builder() .setLinkType(OpenroadmLinkType.OTNLINK) .setOppositeLink(new LinkId(prefix + "SPDRZ-XPDR1-XPDR1-NETWORK1toSPDRA-XPDR1-XPDR1-NETWORK1")) .build()) .addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.Link1.class, - new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.Link1Builder() + new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.Link1Builder() .setAvailableBandwidth(Uint32.valueOf(availBW)) .setUsedBandwidth(Uint32.valueOf(100000 - availBW)) .build()) .addAugmentation( - org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.Link1.class, - new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.Link1Builder() + new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019.Link1Builder() .setOtnLinkType(type) .build()) .build(); @@ -126,20 +125,17 @@ public final class NetworkmodelTestUtil { .setDestNode(new NodeId("SPDRA-XPDR1")) .setDestTp("XPDR1-NETWORK1").build()) .addAugmentation( - Link1.class, new Link1Builder() .setLinkType(OpenroadmLinkType.OTNLINK) .setOppositeLink(new LinkId(prefix + "SPDRA-XPDR1-XPDR1-NETWORK1toSPDRZ-XPDR1-XPDR1-NETWORK1")) .build()) .addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.Link1.class, - new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.Link1Builder() + new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.Link1Builder() .setAvailableBandwidth(Uint32.valueOf(availBW)) .setUsedBandwidth(Uint32.valueOf(100000 - availBW)) .build()) .addAugmentation( - org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.Link1.class, - new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.Link1Builder() + new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019.Link1Builder() .setOtnLinkType(type) .build()) .build(); @@ -153,8 +149,9 @@ public final class NetworkmodelTestUtil { SupportedInterfaceCapability supCapa = new SupportedInterfaceCapabilityBuilder() .setIfCapType(IfOCHOTU4ODU4.class) .build(); - List supInterCapaList = new ArrayList<>(); - supInterCapaList.add(supCapa); + Map supInterCapaList = + new HashMap<>(); + supInterCapaList.put(supCapa.key(),supCapa); TpSupportedInterfaces tpSuppInter = new TpSupportedInterfacesBuilder() .setSupportedInterfaceCapability(supInterCapaList) .build(); @@ -170,9 +167,10 @@ public final class NetworkmodelTestUtil { for (int i = 1; i <= 80; i++) { tpnPool.add(Uint16.valueOf(i)); } - xtpcaBldr.setOdtuTpnPool( - ImmutableList.of( - new OdtuTpnPoolBuilder().setOdtuType(ODTU4TsAllocated.class).setTpnPool(tpnPool).build())); + OdtuTpnPool odtuTpn = new OdtuTpnPoolBuilder() + .setOdtuType(ODTU4TsAllocated.class) + .setTpnPool(tpnPool).build(); + xtpcaBldr.setOdtuTpnPool(ImmutableMap.of(odtuTpn.key(),odtuTpn)); } TerminationPoint1 otnTp1 = new TerminationPoint1Builder() .setTpSupportedInterfaces(tpSuppInter) @@ -183,15 +181,14 @@ public final class NetworkmodelTestUtil { .setNodeRef(new NodeId("SPDRA-XPDR1")) .setTpRef("XPDR1-NETWORK1") .build(); - List supTermPointListA = new ArrayList<>(); - supTermPointListA.add(supTermPointA); + Map supTermPointMapA = + Map.of(supTermPointA.key(), supTermPointA); TerminationPoint tpA = new TerminationPointBuilder() .setTpId(new TpId("XPDR1-NETWORK1")) - .setSupportingTerminationPoint(supTermPointListA) - .addAugmentation(TerminationPoint1.class, otnTp1) + .setSupportingTerminationPoint(supTermPointMapA) + .addAugmentation(otnTp1) .addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1.class, - new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1Builder() + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1Builder() .setTpType(OpenroadmTpType.XPONDERNETWORK) .build()) .build(); @@ -200,15 +197,14 @@ public final class NetworkmodelTestUtil { .setNodeRef(new NodeId("SPDRZ-XPDR1")) .setTpRef("XPDR1-NETWORK1") .build(); - List supTermPointListZ = new ArrayList<>(); - supTermPointListZ.add(supTermPointZ); + Map supTermPointMapZ = + Map.of(supTermPointZ.key(), supTermPointZ); TerminationPoint tpZ = new TerminationPointBuilder() .setTpId(new TpId("XPDR1-NETWORK1")) - .setSupportingTerminationPoint(supTermPointListZ) - .addAugmentation(TerminationPoint1.class, otnTp1) + .setSupportingTerminationPoint(supTermPointMapZ) + .addAugmentation(otnTp1) .addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1.class, - new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1Builder() + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1Builder() .setTpType(OpenroadmTpType.XPONDERNETWORK) .build()) .build(); @@ -218,7 +214,8 @@ public final class NetworkmodelTestUtil { return tps; } - private static List createDegreeMappings(List mappingList, int degNbStart, int degNbStop) { + private static Map createDegreeMappings(Map mappingMap, + int degNbStart, int degNbStop) { for (int i = degNbStart; i <= degNbStop; i++) { Mapping mapping = new MappingBuilder() .setLogicalConnectionPoint("DEG" + i + "-TTP-TXRX") @@ -228,12 +225,13 @@ public final class NetworkmodelTestUtil { .setSupportingOts("OTS-DEG" + i + "-TTP-TXRX") .setSupportingOms("OMS-DEG" + i + "-TTP-TXRX") .build(); - mappingList.add(mapping); + mappingMap.put(mapping.key(),mapping); } - return mappingList; + return mappingMap; } - private static List createSrgMappings(List mappingList, int srgNbStart, int srgNbStop) { + private static Map createSrgMappings(Map mappingMap, + int srgNbStart, int srgNbStop) { for (int i = srgNbStart; i <= srgNbStop; i++) { for (int j = 1; j <= 4; j++) { Mapping mapping = new MappingBuilder() @@ -242,17 +240,19 @@ public final class NetworkmodelTestUtil { .setSupportingPort("C" + j) .setSupportingCircuitPackName(3 + i + "/0") .build(); - mappingList.add(mapping); + mappingMap.put(mapping.key(),mapping); } } - return mappingList; + return mappingMap; } - private static List createXpdrMappings(List mappingList, int networkPortNb, int clientPortNb, + private static Map createXpdrMappings(Map mappingMap, + int networkPortNb, int clientPortNb, XpdrNodeTypes xpdrNodeType) { for (int i = 1; i <= networkPortNb; i++) { - List> supportedIntf = new ArrayList<>(); - supportedIntf.add(IfOCH.class); + List> supportedIntf = new ArrayList<>(); + supportedIntf.add(org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.IfOCH.class); MappingBuilder mappingBldr = new MappingBuilder() .setLogicalConnectionPoint("XPDR1-NETWORK" + i) .setPortDirection("bidirectional") @@ -264,11 +264,13 @@ public final class NetworkmodelTestUtil { if (xpdrNodeType != null) { mappingBldr.setXponderType(xpdrNodeType); } - mappingList.add(mappingBldr.build()); + Mapping mapping = mappingBldr.build(); + mappingMap.put(mapping.key(),mapping); } for (int i = 1; i <= clientPortNb; i++) { - List> supportedIntf = new ArrayList<>(); - supportedIntf.add(If100GE.class); + List> supportedIntf = new ArrayList<>(); + supportedIntf.add(org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If100GE.class); Mapping mapping = new MappingBuilder() .setLogicalConnectionPoint("XPDR1-CLIENT" + i) .setPortDirection("bidirectional") @@ -278,9 +280,9 @@ public final class NetworkmodelTestUtil { .setPortQual(PortQual.XpdrClient.getName()) .setSupportingCircuitPackName("1/0/" + i + "-PLUG-CLIENT") .build(); - mappingList.add(mapping); + mappingMap.put(mapping.key(),mapping); } - return mappingList; + return mappingMap; } private NetworkmodelTestUtil() {