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=bfc6f672f7a2adbc2aca650319c27f56782d03fa;hb=56d1795b647693ec1d620d6aca2c4003e3b302ca;hp=127200f7625124300695062666bdb75c43dd60ef;hpb=67763b4d82e44c68fdbc765cdeec5496ff65b01e;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 127200f76..bfc6f672f 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 @@ -10,35 +10,40 @@ package org.opendaylight.transportpce.networkmodel.util.test; import com.google.common.collect.ImmutableMap; import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; import org.opendaylight.transportpce.common.NetworkUtils; -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.opendaylight.transportpce.networkutils.rev220630.OtnLinkType; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.MappingBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.MappingKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.network.NodesBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.network.nodes.NodeInfoBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Link1Builder; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.PortQual; 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.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.http.org.openroadm.network.types.rev211210.xpdr.tp.supported.interfaces.SupportedInterfaceCapability; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.xpdr.tp.supported.interfaces.SupportedInterfaceCapabilityBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.xpdr.tp.supported.interfaces.SupportedInterfaceCapabilityKey; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev210924.ODTU4TsAllocated; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev210924.ODU4; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210.TerminationPoint1; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210.TerminationPoint1Builder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210.networks.network.node.termination.point.TpSupportedInterfaces; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210.networks.network.node.termination.point.TpSupportedInterfacesBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210.networks.network.node.termination.point.XpdrTpPortConnectionAttributesBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.If100GE; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.IfOCH; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.IfOCHOTU4ODU4; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.SupportedIfCapability; +import org.opendaylight.yang.gen.v1.http.org.openroadm.xponder.rev211210.xpdr.otn.tp.attributes.OdtuTpnPool; +import org.opendaylight.yang.gen.v1.http.org.openroadm.xponder.rev211210.xpdr.otn.tp.attributes.OdtuTpnPoolBuilder; 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; @@ -61,16 +66,17 @@ 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) { + public static Nodes createMappingForRdm(String nodeId, String clli, int degNb, List srgNbs) { Map mappingList = new HashMap<>(); createDegreeMappings(mappingList, 1, degNb); - createSrgMappings(mappingList, 1, srgNb); - Nodes mappingNode = new NodesBuilder() + for (Integer integer : srgNbs) { + createSrgMappings(mappingList, integer.intValue()); + } + return new NodesBuilder() .setNodeId(nodeId) .setNodeInfo(new NodeInfoBuilder().setNodeType(NodeTypes.Rdm).setNodeClli(clli).build()) .setMapping(mappingList) .build(); - return mappingNode; } public static Nodes createMappingForXpdr(String nodeId, String clli, int networkPortNb, int clientPortNb, @@ -86,56 +92,54 @@ public final class NetworkmodelTestUtil { return mappingNode; } - public static List createSuppOTNLinks(OtnLinkType type, int availBW) { - String prefix = null; - if (OtnLinkType.OTU4.equals(type)) { - prefix = "OTU4-"; - } else if (OtnLinkType.ODTU4.equals(type)) { - prefix = "ODU4-"; - } + public static List createSuppOTNLinks(OtnLinkType type, Uint32 availBW) { Link linkAZ = new LinkBuilder() - .setLinkId(new LinkId(prefix + "SPDRA-XPDR1-XPDR1-NETWORK1toSPDRZ-XPDR1-XPDR1-NETWORK1")) + .setLinkId(new LinkId(type.getName() + "-SPDRA-XPDR1-XPDR1-NETWORK1toSPDRZ-XPDR1-XPDR1-NETWORK1")) .setSource(new SourceBuilder() .setSourceNode(new NodeId("SPDRA-XPDR1")) - .setSourceTp("XPDR1-NETWORK1").build()) + .setSourceTp(new TpId("XPDR1-NETWORK1")).build()) .setDestination(new DestinationBuilder() .setDestNode(new NodeId("SPDRZ-XPDR1")) - .setDestTp("XPDR1-NETWORK1").build()) + .setDestTp(new TpId("XPDR1-NETWORK1")).build()) .addAugmentation( new Link1Builder() .setLinkType(OpenroadmLinkType.OTNLINK) - .setOppositeLink(new LinkId(prefix + "SPDRZ-XPDR1-XPDR1-NETWORK1toSPDRA-XPDR1-XPDR1-NETWORK1")) + .setOppositeLink(new LinkId(type.getName() + + "-SPDRZ-XPDR1-XPDR1-NETWORK1toSPDRA-XPDR1-XPDR1-NETWORK1")) .build()) .addAugmentation( - new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.Link1Builder() - .setAvailableBandwidth(Uint32.valueOf(availBW)) - .setUsedBandwidth(Uint32.valueOf(100000 - availBW)) + new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210.Link1Builder() + .setAvailableBandwidth(availBW) + .setUsedBandwidth(Uint32.valueOf(100000 - availBW.intValue())) .build()) .addAugmentation( - new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019.Link1Builder() + new org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630 + .Link1Builder() .setOtnLinkType(type) .build()) .build(); Link linkZA = new LinkBuilder() - .setLinkId(new LinkId(prefix + "SPDRZ-XPDR1-XPDR1-NETWORK1toSPDRA-XPDR1-XPDR1-NETWORK1")) + .setLinkId(new LinkId(type.getName() + "-SPDRZ-XPDR1-XPDR1-NETWORK1toSPDRA-XPDR1-XPDR1-NETWORK1")) .setSource(new SourceBuilder() .setSourceNode(new NodeId("SPDRZ-XPDR1")) - .setSourceTp("XPDR1-NETWORK1").build()) + .setSourceTp(new TpId("XPDR1-NETWORK1")).build()) .setDestination(new DestinationBuilder() .setDestNode(new NodeId("SPDRA-XPDR1")) - .setDestTp("XPDR1-NETWORK1").build()) + .setDestTp(new TpId("XPDR1-NETWORK1")).build()) .addAugmentation( new Link1Builder() .setLinkType(OpenroadmLinkType.OTNLINK) - .setOppositeLink(new LinkId(prefix + "SPDRA-XPDR1-XPDR1-NETWORK1toSPDRZ-XPDR1-XPDR1-NETWORK1")) + .setOppositeLink(new LinkId(type.getName() + + "-SPDRA-XPDR1-XPDR1-NETWORK1toSPDRZ-XPDR1-XPDR1-NETWORK1")) .build()) .addAugmentation( - new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.Link1Builder() - .setAvailableBandwidth(Uint32.valueOf(availBW)) - .setUsedBandwidth(Uint32.valueOf(100000 - availBW)) + new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210.Link1Builder() + .setAvailableBandwidth(availBW) + .setUsedBandwidth(Uint32.valueOf(100000 - availBW.intValue())) .build()) .addAugmentation( - new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019.Link1Builder() + new org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630 + .Link1Builder() .setOtnLinkType(type) .build()) .build(); @@ -158,12 +162,12 @@ public final class NetworkmodelTestUtil { XpdrTpPortConnectionAttributesBuilder xtpcaBldr = new XpdrTpPortConnectionAttributesBuilder() .setRate(ODU4.class); if (withTpnTsPool) { - List tsPool = new ArrayList<>(); + Set tsPool = new HashSet<>(); for (int i = 0; i < 80; i++) { tsPool.add(Uint16.valueOf(i + 1)); } xtpcaBldr.setTsPool(tsPool); - List tpnPool = new ArrayList<>(); + Set tpnPool = new HashSet<>(); for (int i = 1; i <= 80; i++) { tpnPool.add(Uint16.valueOf(i)); } @@ -179,7 +183,7 @@ public final class NetworkmodelTestUtil { SupportingTerminationPoint supTermPointA = new SupportingTerminationPointBuilder() .setNetworkRef(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)) .setNodeRef(new NodeId("SPDRA-XPDR1")) - .setTpRef("XPDR1-NETWORK1") + .setTpRef(new TpId("XPDR1-NETWORK1")) .build(); Map supTermPointMapA = Map.of(supTermPointA.key(), supTermPointA); @@ -188,14 +192,14 @@ public final class NetworkmodelTestUtil { .setSupportingTerminationPoint(supTermPointMapA) .addAugmentation(otnTp1) .addAugmentation( - new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1Builder() + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.TerminationPoint1Builder() .setTpType(OpenroadmTpType.XPONDERNETWORK) .build()) .build(); SupportingTerminationPoint supTermPointZ = new SupportingTerminationPointBuilder() .setNetworkRef(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)) .setNodeRef(new NodeId("SPDRZ-XPDR1")) - .setTpRef("XPDR1-NETWORK1") + .setTpRef(new TpId("XPDR1-NETWORK1")) .build(); Map supTermPointMapZ = Map.of(supTermPointZ.key(), supTermPointZ); @@ -204,7 +208,7 @@ public final class NetworkmodelTestUtil { .setSupportingTerminationPoint(supTermPointMapZ) .addAugmentation(otnTp1) .addAugmentation( - new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1Builder() + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.TerminationPoint1Builder() .setTpType(OpenroadmTpType.XPONDERNETWORK) .build()) .build(); @@ -230,18 +234,15 @@ public final class NetworkmodelTestUtil { return mappingMap; } - 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() - .setLogicalConnectionPoint("SRG" + i + "-PP" + j + "-TXRX") - .setPortDirection("bidirectional") - .setSupportingPort("C" + j) - .setSupportingCircuitPackName(3 + i + "/0") - .build(); - mappingMap.put(mapping.key(),mapping); - } + private static Map createSrgMappings(Map mappingMap, int srgNb) { + for (int j = 1; j <= 4; j++) { + Mapping mapping = new MappingBuilder() + .setLogicalConnectionPoint("SRG" + srgNb + "-PP" + j + "-TXRX") + .setPortDirection("bidirectional") + .setSupportingPort("C" + j) + .setSupportingCircuitPackName(3 + srgNb + "/0") + .build(); + mappingMap.put(mapping.key(),mapping); } return mappingMap; } @@ -250,9 +251,8 @@ public final class NetworkmodelTestUtil { int networkPortNb, int clientPortNb, XpdrNodeTypes xpdrNodeType) { for (int i = 1; i <= networkPortNb; i++) { - List> supportedIntf = new ArrayList<>(); - supportedIntf.add(org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.IfOCH.class); + Set> supportedIntf = new HashSet<>(); + supportedIntf.add(IfOCH.class); MappingBuilder mappingBldr = new MappingBuilder() .setLogicalConnectionPoint("XPDR1-NETWORK" + i) .setPortDirection("bidirectional") @@ -268,9 +268,8 @@ public final class NetworkmodelTestUtil { mappingMap.put(mapping.key(),mapping); } for (int i = 1; i <= clientPortNb; i++) { - List> supportedIntf = new ArrayList<>(); - supportedIntf.add(org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If100GE.class); + Set> supportedIntf = new HashSet<>(); + supportedIntf.add(If100GE.class); Mapping mapping = new MappingBuilder() .setLogicalConnectionPoint("XPDR1-CLIENT" + i) .setPortDirection("bidirectional")