X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=networkmodel%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fnetworkmodel%2Futil%2FOpenRoadmOtnTopology.java;h=3f1b5388a6a2c96475560a45608ace57ece6f6fa;hb=67763b4d82e44c68fdbc765cdeec5496ff65b01e;hp=69376befeccfd8b28ed497217067a732e906492c;hpb=e25624aca3a34b7a8e30cd8b8819eb6ca838932d;p=transportpce.git diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java index 69376befe..3f1b5388a 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java @@ -8,7 +8,7 @@ package org.opendaylight.transportpce.networkmodel.util; -import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -18,46 +18,60 @@ import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.transportpce.common.NetworkUtils; import org.opendaylight.transportpce.networkmodel.dto.OtnTopoNode; import org.opendaylight.transportpce.networkmodel.dto.TopologyShard; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.Nodes; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.Mapping; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.XpdrNodeTypes; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev181130.xpdr.odu.switching.pools.OduSwitchingPools; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev181130.xpdr.odu.switching.pools.OduSwitchingPoolsBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev181130.xpdr.odu.switching.pools.odu.switching.pools.NonBlockingList; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev181130.xpdr.odu.switching.pools.odu.switching.pools.NonBlockingListBuilder; -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.OpenroadmNodeType; -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.ODU0; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev181130.ODU2e; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev181130.ODU4; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev181130.OduRateIdentity; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.Link1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.Link1Builder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.Node1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.Node1Builder; -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.SwitchingPools; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.networks.network.node.SwitchingPoolsBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.networks.network.node.TpBandwidthSharing; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.networks.network.node.TpBandwidthSharingBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.networks.network.node.XpdrAttributes; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.networks.network.node.XpdrAttributesBuilder; -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.rev181130.If100GE; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev181130.If100GEODU4; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev181130.If10GEODU2e; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev181130.IfOCHOTU4ODU4; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev181130.SupportedIfCapability; -import org.opendaylight.yang.gen.v1.http.org.openroadm.switching.pool.types.rev181130.SwitchingPoolTypes; -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.opendaylight.transportpce.portmapping.rev210315.mapping.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.XpdrNodeTypes; +import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.AdminStates; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev200327.xpdr.odu.switching.pools.OduSwitchingPools; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev200327.xpdr.odu.switching.pools.OduSwitchingPoolsBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev200327.xpdr.odu.switching.pools.OduSwitchingPoolsKey; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev200327.xpdr.odu.switching.pools.odu.switching.pools.NonBlockingList; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev200327.xpdr.odu.switching.pools.odu.switching.pools.NonBlockingListBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev200327.xpdr.odu.switching.pools.odu.switching.pools.NonBlockingListKey; +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.OpenroadmNodeType; +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.ODU0; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev200327.ODU2; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev200327.ODU2e; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev200327.ODU4; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev200327.OduRateIdentity; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.Link1; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.Link1Builder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.Node1; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.Node1Builder; +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.SwitchingPools; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.networks.network.node.SwitchingPoolsBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.networks.network.node.TpBandwidthSharing; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.networks.network.node.TpBandwidthSharingBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.networks.network.node.XpdrAttributes; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.networks.network.node.XpdrAttributesBuilder; +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.If100GE; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If100GEODU4; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If10GE; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If10GEODU2; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If10GEODU2e; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If1GE; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If1GEODU0; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If400GE; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.IfOCH; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.IfOCHOTU4ODU4; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.IfOTUCnODUCn; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.SupportedIfCapability; +import org.opendaylight.yang.gen.v1.http.org.openroadm.switching.pool.types.rev191129.SwitchingPoolTypes; +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.rev180226.networks.network.Node; @@ -74,6 +88,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.TerminationPointKey; 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; @@ -215,8 +230,8 @@ public final class OpenRoadmOtnTopology { private static List initialiseOtnLinks(String nodeA, String tpA, String nodeZ, String tpZ, OtnLinkType linkType, String linkIdPrefix) { List links = new ArrayList<>(); - org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.Link1 tpceLink1 - = new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.Link1Builder() + org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019.Link1 tpceLink1 + = new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019.Link1Builder() .setOtnLinkType(linkType).build(); Link1 otnLink1 = new Link1Builder() .setAvailableBandwidth(Uint32.valueOf(100000)) @@ -234,28 +249,30 @@ public final class OpenRoadmOtnTopology { } LinkBuilder ietfLinkAZBldr = TopologyUtils.createLink(nodeATopo, nodeZTopo, tpA, tpZ, linkIdPrefix); ietfLinkAZBldr - .addAugmentation(org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.Link1.class, tpceLink1) - .addAugmentation(Link1.class, otnLink1) + .addAugmentation(tpceLink1) + .addAugmentation(otnLink1) .addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1.class, - new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1Builder( + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1Builder( ietfLinkAZBldr.augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1.class)) - .setLinkType(OpenroadmLinkType.OTNLINK) - .build()); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1.class)) + .setLinkType(OpenroadmLinkType.OTNLINK) + .setOperationalState(State.InService) + .setAdministrativeState(AdminStates.InService) + .build()); links.add(ietfLinkAZBldr.build()); // create link Z-A LinkBuilder ietfLinkZABldr = TopologyUtils.createLink(nodeZTopo, nodeATopo, tpZ, tpA, linkIdPrefix); ietfLinkZABldr - .addAugmentation(org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.Link1.class, tpceLink1) - .addAugmentation(Link1.class, otnLink1) + .addAugmentation(tpceLink1) + .addAugmentation(otnLink1) .addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1.class, - new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1Builder( + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1Builder( ietfLinkZABldr.augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1.class)) - .setLinkType(OpenroadmLinkType.OTNLINK) - .build()); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1.class)) + .setLinkType(OpenroadmLinkType.OTNLINK) + .setOperationalState(State.InService) + .setAdministrativeState(AdminStates.InService) + .build()); links.add(ietfLinkZABldr.build()); return links; } @@ -266,7 +283,7 @@ public final class OpenRoadmOtnTopology { Link1Builder updatedLink1Bldr = new Link1Builder(link.augmentation(Link1.class)) .setAvailableBandwidth(Uint32.valueOf(availBw)) .setUsedBandwidth(Uint32.valueOf(usedBw)); - updatedLinkBldr.addAugmentation(Link1.class, updatedLink1Bldr.build()); + updatedLinkBldr.addAugmentation(updatedLink1Bldr.build()); return updatedLinkBldr.build(); } @@ -287,14 +304,14 @@ public final class OpenRoadmOtnTopology { for (int i = 1; i <= NB_TRIB_PORTS; i++) { tpnPool.add(Uint16.valueOf(i)); } - xtpcaBldr.setOdtuTpnPool(ImmutableList.of(new OdtuTpnPoolBuilder().setOdtuType(ODTU4TsAllocated.class) - .setTpnPool(tpnPool).build())); + OdtuTpnPool oduTpnPool = new OdtuTpnPoolBuilder().setOdtuType(ODTU4TsAllocated.class) + .setTpnPool(tpnPool).build(); + xtpcaBldr.setOdtuTpnPool(ImmutableMap.of(oduTpnPool.key(),oduTpnPool)); } else { xtpcaBldr.setTsPool(null); - xtpcaBldr.setOdtuTpnPool(null); + xtpcaBldr.setOdtuTpnPool(ImmutableMap.of()); } - return tpBldr.addAugmentation(TerminationPoint1.class, - otnTp1Bldr.setXpdrTpPortConnectionAttributes(xtpcaBldr.build()).build()).build(); + return tpBldr.addAugmentation(otnTp1Bldr.setXpdrTpPortConnectionAttributes(xtpcaBldr.build()).build()).build(); } private static TerminationPoint updateNodeTpTsPool(TerminationPoint tp, String serviceRate, Short tribPortNb, @@ -330,8 +347,9 @@ public final class OpenRoadmOtnTopology { } xtpcaBldr.setTsPool(tsPool); List tpnPool; - if (xtpcaBldr.getOdtuTpnPool().get(0).getTpnPool() != null) { - tpnPool = new ArrayList<>(xtpcaBldr.getOdtuTpnPool().get(0).getTpnPool()); + List odtuTpnPoolValues = new ArrayList<>(xtpcaBldr.getOdtuTpnPool().values()); + if (odtuTpnPoolValues.get(0).getTpnPool() != null) { + tpnPool = new ArrayList<>(odtuTpnPoolValues.get(0).getTpnPool()); if (isDeletion) { tpnPool.add(Uint16.valueOf(tribPortNb)); } else { @@ -340,32 +358,38 @@ public final class OpenRoadmOtnTopology { } else { tpnPool = new ArrayList<>(); } - xtpcaBldr.setOdtuTpnPool(ImmutableList.of(new OdtuTpnPoolBuilder().setOdtuType(ODTU4TsAllocated.class) - .setTpnPool(tpnPool).build())); + OdtuTpnPool odtuTpnPool = new OdtuTpnPoolBuilder().setOdtuType(ODTU4TsAllocated.class) + .setTpnPool(tpnPool).build(); + xtpcaBldr.setOdtuTpnPool(ImmutableMap.of(odtuTpnPool.key(),odtuTpnPool)); - tpBldr.addAugmentation(TerminationPoint1.class, - new TerminationPoint1Builder().setXpdrTpPortConnectionAttributes(xtpcaBldr.build()).build()); + tpBldr.addAugmentation(new TerminationPoint1Builder(tp.augmentation(TerminationPoint1.class)) + .setXpdrTpPortConnectionAttributes(xtpcaBldr.build()).build()); return tpBldr.build(); } private static Map convertPortMappingToOtnNodeList(Nodes mappingNode) { - List networkMappings = mappingNode.getMapping().stream().filter(k -> k.getLogicalConnectionPoint() + List networkMappings = mappingNode.nonnullMapping().values() + .stream().filter(k -> k.getLogicalConnectionPoint() .contains("NETWORK")).collect(Collectors.toList()); Map xpdrMap = new HashMap<>(); for (Mapping mapping : networkMappings) { Integer xpdrNb = Integer.parseInt(mapping.getLogicalConnectionPoint().split("XPDR")[1].split("-")[0]); if (!xpdrMap.containsKey(xpdrNb)) { - List xpdrNetMaps = mappingNode.getMapping().stream().filter(k -> k.getLogicalConnectionPoint() + List xpdrNetMaps = mappingNode.nonnullMapping().values() + .stream().filter(k -> k.getLogicalConnectionPoint() .contains("XPDR" + xpdrNb + NETWORK)).collect(Collectors.toList()); - List xpdrClMaps = mappingNode.getMapping().stream().filter(k -> k.getLogicalConnectionPoint() + List xpdrClMaps = mappingNode.nonnullMapping().values() + .stream().filter(k -> k.getLogicalConnectionPoint() .contains("XPDR" + xpdrNb + CLIENT)).collect(Collectors.toList()); OtnTopoNode otnNode = null; if (mapping.getXponderType() != null) { otnNode = new OtnTopoNode(mappingNode.getNodeId(), mappingNode.getNodeInfo().getNodeClli(), xpdrNb, - mapping.getXponderType(), fillConnectionMapLcp(xpdrNetMaps), fillConnectionMapLcp(xpdrClMaps)); + mapping.getXponderType(), fillConnectionMapLcp(xpdrNetMaps), fillConnectionMapLcp(xpdrClMaps), + xpdrNetMaps, xpdrClMaps); } else { otnNode = new OtnTopoNode(mappingNode.getNodeId(), mappingNode.getNodeInfo().getNodeClli(), xpdrNb, - XpdrNodeTypes.Tpdr, fillConnectionMapLcp(xpdrNetMaps), fillConnectionMapLcp(xpdrClMaps)); + XpdrNodeTypes.Tpdr, fillConnectionMapLcp(xpdrNetMaps), fillConnectionMapLcp(xpdrClMaps), + xpdrNetMaps, xpdrClMaps); } xpdrMap.put(xpdrNb, otnNode); } @@ -396,18 +420,21 @@ public final class OpenRoadmOtnTopology { Node1 otnNodeAug = new Node1Builder() .setXpdrAttributes(xpdrAttr) .build(); - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1 ocnNodeAug = - new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1Builder() - .setNodeType(OpenroadmNodeType.TPDR).build(); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1 ocnNodeAug = + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1Builder() + .setNodeType(OpenroadmNodeType.TPDR) + .setOperationalState(State.InService) + .setAdministrativeState(AdminStates.InService) + .build(); // create ietf node augmentation to add TP list - List tpList = new ArrayList<>(); + Map tpMap = new HashMap<>(); // creation of tps - createTP(tpList, node, OpenroadmTpType.XPONDERCLIENT, If100GE.class, false); - createTP(tpList, node, OpenroadmTpType.XPONDERNETWORK, IfOCHOTU4ODU4.class, true); + createTP(tpMap, node, OpenroadmTpType.XPONDERCLIENT, false); + createTP(tpMap, node, OpenroadmTpType.XPONDERNETWORK, true); org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1 ietfNodeAug = new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1Builder() - .setTerminationPoint(tpList) + .setTerminationPoint(tpMap) .build(); // return ietfNode @@ -415,12 +442,9 @@ public final class OpenRoadmOtnTopology { .setNodeId(new NodeId(node.getNodeId() + XPDR + node.getXpdrNb())) .withKey(new NodeKey(new NodeId(node.getNodeId() + XPDR + node.getXpdrNb()))) .setSupportingNode(createSupportingNodes(node)) - .addAugmentation(Node1.class, otnNodeAug) - .addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1.class, - ocnNodeAug) - .addAugmentation( - org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1.class, - ietfNodeAug) + .addAugmentation(otnNodeAug) + .addAugmentation(ocnNodeAug) + .addAugmentation(ietfNodeAug) .build(); } @@ -432,7 +456,7 @@ public final class OpenRoadmOtnTopology { .setXpdrNumber(Uint16.valueOf(node.getXpdrNb())) .build(); - List nblList = new ArrayList<>(); + Map nbMap = new HashMap<>(); for (int i = 1; i <= node.getNbTpClient(); i++) { List tpList = new ArrayList<>(); TpId tpId = new TpId("XPDR" + node.getXpdrNb() + CLIENT + i); @@ -445,36 +469,37 @@ public final class OpenRoadmOtnTopology { .setAvailableInterconnectBandwidth(Uint32.valueOf(node.getNbTpNetwork() * 10L)) .setInterconnectBandwidthUnit(Uint32.valueOf(1000000000)) .build(); - nblList.add(nbl); + nbMap.put(nbl.key(),nbl); } OduSwitchingPools oduSwitchPool = new OduSwitchingPoolsBuilder() .setSwitchingPoolNumber(Uint16.valueOf(1)) .setSwitchingPoolType(SwitchingPoolTypes.NonBlocking) - .setNonBlockingList(nblList) + .setNonBlockingList(nbMap) .build(); - List oduSwitchPoolList = new ArrayList<>(); - oduSwitchPoolList.add(oduSwitchPool); SwitchingPools switchingPools = new SwitchingPoolsBuilder() - .setOduSwitchingPools(oduSwitchPoolList) + .setOduSwitchingPools(Map.of(oduSwitchPool.key(),oduSwitchPool)) .build(); Node1 otnNodeAug = new Node1Builder() .setTpBandwidthSharing(tpBwSh) .setXpdrAttributes(xpdrAttr) .setSwitchingPools(switchingPools) .build(); - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1 ocnNodeAug = - new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1Builder() - .setNodeType(OpenroadmNodeType.MUXPDR).build(); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1 ocnNodeAug = + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1Builder() + .setNodeType(OpenroadmNodeType.MUXPDR) + .setAdministrativeState(AdminStates.InService) + .setOperationalState(State.InService) + .build(); // create ietf node augmentation to add TP list - List tpList = new ArrayList<>(); + Map tpMap = new HashMap<>(); // creation of tps - createTP(tpList, node, OpenroadmTpType.XPONDERCLIENT, If10GEODU2e.class, true); - createTP(tpList, node, OpenroadmTpType.XPONDERNETWORK, IfOCHOTU4ODU4.class, true); + createTP(tpMap, node, OpenroadmTpType.XPONDERCLIENT, true); + createTP(tpMap, node, OpenroadmTpType.XPONDERNETWORK, true); org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1 ietfNodeAug = new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1Builder() - .setTerminationPoint(tpList) + .setTerminationPoint(tpMap) .build(); // return ietfNode @@ -482,12 +507,9 @@ public final class OpenRoadmOtnTopology { .setNodeId(new NodeId(node.getNodeId() + XPDR + node.getXpdrNb())) .withKey(new NodeKey(new NodeId(node.getNodeId() + XPDR + node.getXpdrNb()))) .setSupportingNode(createSupportingNodes(node)) - .addAugmentation(Node1.class, otnNodeAug) - .addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1.class, - ocnNodeAug) - .addAugmentation( - org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1.class, - ietfNodeAug) + .addAugmentation(otnNodeAug) + .addAugmentation(ocnNodeAug) + .addAugmentation(ietfNodeAug) .build(); } @@ -502,20 +524,20 @@ public final class OpenRoadmOtnTopology { tpId = new TpId("XPDR" + node.getXpdrNb() + NETWORK + i); tpl.add(tpId); } - List nblList = new ArrayList<>(); + Map nbMap = new HashMap<>(); NonBlockingList nbl = new NonBlockingListBuilder() .setNblNumber(Uint16.valueOf(1)) .setTpList(tpl) .build(); - nblList.add(nbl); + nbMap.put(nbl.key(),nbl); OduSwitchingPools oduSwitchPool = new OduSwitchingPoolsBuilder() .setSwitchingPoolNumber(Uint16.valueOf(1)) .setSwitchingPoolType(SwitchingPoolTypes.NonBlocking) - .setNonBlockingList(nblList) + .setNonBlockingList(nbMap) .build(); - List oduSwitchPoolList = new ArrayList<>(); - oduSwitchPoolList.add(oduSwitchPool); + Map oduSwitchPoolList = new HashMap<>(); + oduSwitchPoolList.put(oduSwitchPool.key(),oduSwitchPool); SwitchingPools switchingPools = new SwitchingPoolsBuilder() .setOduSwitchingPools(oduSwitchPoolList) .build(); @@ -532,18 +554,21 @@ public final class OpenRoadmOtnTopology { .setXpdrAttributes(xpdrAttr) .setSwitchingPools(switchingPools) .build(); - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1 ocnNodeAug = - new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1Builder() - .setNodeType(OpenroadmNodeType.SWITCH).build(); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1 ocnNodeAug = + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1Builder() + .setNodeType(OpenroadmNodeType.SWITCH) + .setOperationalState(State.InService) + .setAdministrativeState(AdminStates.InService) + .build(); // create ietf node augmentation to add TP list - List tpList = new ArrayList<>(); + Map tpMap = new HashMap<>(); // creation of tps - createTP(tpList, node, OpenroadmTpType.XPONDERCLIENT, If100GEODU4.class, true); - createTP(tpList, node, OpenroadmTpType.XPONDERNETWORK, IfOCHOTU4ODU4.class, true); + createTP(tpMap, node, OpenroadmTpType.XPONDERCLIENT, true); + createTP(tpMap, node, OpenroadmTpType.XPONDERNETWORK, true); org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1 ietfNodeAug = new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1Builder() - .setTerminationPoint(tpList) + .setTerminationPoint(tpMap) .build(); // return ietfNode @@ -551,77 +576,104 @@ public final class OpenRoadmOtnTopology { .setNodeId(new NodeId(node.getNodeId() + XPDR + node.getXpdrNb())) .withKey(new NodeKey(new NodeId(node.getNodeId() + XPDR + node.getXpdrNb()))) .setSupportingNode(createSupportingNodes(node)) - .addAugmentation(Node1.class, otnNodeAug) - .addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1.class, - ocnNodeAug) - .addAugmentation( - org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1.class, - ietfNodeAug) + .addAugmentation(otnNodeAug) + .addAugmentation(ocnNodeAug) + .addAugmentation(ietfNodeAug) .build(); } - private static void createTP(List tpList, OtnTopoNode node, OpenroadmTpType tpType, - Class ifCapType, boolean withRate) { - long nbTps = 0; - if (OpenroadmTpType.XPONDERCLIENT.equals(tpType)) { - nbTps = node.getNbTpClient(); - } else if (OpenroadmTpType.XPONDERNETWORK.equals(tpType)) { - nbTps = node.getNbTpNetwork(); - } else { - LOG.warn("Wrong tp-type {}, cannot create tp {}", tpType, tpType.getName()); + private static void createTP(Map tpMap, + OtnTopoNode node, OpenroadmTpType tpType, boolean withRate) { + List mappings = null; + switch (tpType) { + case XPONDERNETWORK: + mappings = node.getXpdrNetMappings(); + break; + case XPONDERCLIENT: + mappings = node.getXpdrClMappings(); + break; + default: + LOG.error("Error with Termination Point type {}", tpType); + return; } + fillTpMap(tpMap, node, tpType, withRate, mappings); + } - for (int i = 1; i <= nbTps; i++) { + private static void fillTpMap(Map tpMap, OtnTopoNode node, + OpenroadmTpType tpType, boolean withRate, List mappings) { + for (Mapping mapping : mappings) { // openroadm-otn-topoology augmentation - SupportedInterfaceCapability supIfCapa = new SupportedInterfaceCapabilityBuilder() - .setIfCapType(ifCapType) - .build(); - List supIfCapaList = new ArrayList<>(); - supIfCapaList.add(supIfCapa); - TpSupportedInterfaces tpSupIf = new TpSupportedInterfacesBuilder() - .setSupportedInterfaceCapability(supIfCapaList) - .build(); - - XpdrTpPortConnectionAttributesBuilder xtpcaBldr = new XpdrTpPortConnectionAttributesBuilder(); - if (withRate) { - xtpcaBldr.setRate(fixRate(ifCapType)); + Map supIfMap = new HashMap<>(); + TerminationPoint1Builder otnTp1Bldr = new TerminationPoint1Builder(); + if (mapping.getSupportedInterfaceCapability() != null) { + XpdrTpPortConnectionAttributesBuilder xtpcaBldr = new XpdrTpPortConnectionAttributesBuilder(); + for (Class supInterCapa : mapping.getSupportedInterfaceCapability()) { + SupportedInterfaceCapability supIfCapa = new SupportedInterfaceCapabilityBuilder() + .withKey(new SupportedInterfaceCapabilityKey(convertSupIfCapa(supInterCapa))) + .setIfCapType(convertSupIfCapa(supInterCapa)) + .build(); + supIfMap.put(supIfCapa.key(), supIfCapa); + } + TpSupportedInterfaces tpSupIf = new TpSupportedInterfacesBuilder() + .setSupportedInterfaceCapability(supIfMap) + .build(); + otnTp1Bldr.setTpSupportedInterfaces(tpSupIf); + if (withRate) { + xtpcaBldr.setRate(fixRate(mapping.getSupportedInterfaceCapability().get(0))); + otnTp1Bldr.setXpdrTpPortConnectionAttributes(xtpcaBldr.build()); + } + } else { + LOG.warn("mapping {} of node {} has no if-cap-type", mapping.getLogicalConnectionPoint(), + node.getNodeId()); } - TerminationPoint1 otnTp1 = new TerminationPoint1Builder() - .setTpSupportedInterfaces(tpSupIf) - .setXpdrTpPortConnectionAttributes(xtpcaBldr.build()) - .build(); - org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.TerminationPoint1Builder tpceTp1Bldr = - new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.TerminationPoint1Builder(); - if (OpenroadmTpType.XPONDERNETWORK.equals(tpType)) { - TpId tpId = new TpId("XPDR" + node.getXpdrNb() + NETWORK + i); + org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019.TerminationPoint1Builder tpceTp1Bldr = + new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019.TerminationPoint1Builder(); + TpId tpId = new TpId(mapping.getLogicalConnectionPoint()); + setclientNwTpAttr(tpMap, node, tpId, tpType, otnTp1Bldr.build(), tpceTp1Bldr, mapping); + } + } + + private static void setclientNwTpAttr(Map tpMap, OtnTopoNode node, TpId tpId, + OpenroadmTpType tpType, TerminationPoint1 otnTp1, + org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019.TerminationPoint1Builder tpceTp1Bldr, + Mapping mapping) { + switch (tpType) { + case XPONDERNETWORK: if (node.getXpdrNetConnectionMap().get(tpId.getValue()) != null) { tpceTp1Bldr.setAssociatedConnectionMapPort(node.getXpdrNetConnectionMap().get(tpId.getValue())); } SupportingTerminationPoint stp = new SupportingTerminationPointBuilder() .setNetworkRef(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)) .setNodeRef(new NodeId(node.getNodeId() + XPDR + node.getXpdrNb())) - .setTpRef("XPDR" + node.getXpdrNb() + NETWORK + i) + .setTpRef(tpId.getValue()) .build(); - List supportTpList = new ArrayList<>(); - supportTpList.add(stp); - tpList.add(buildIetfTp(tpceTp1Bldr, otnTp1, tpType, tpId, supportTpList)); - } else if (OpenroadmTpType.XPONDERCLIENT.equals(tpType)) { - TpId tpId = new TpId("XPDR" + node.getXpdrNb() + CLIENT + i); + TerminationPoint ietfTpNw = buildIetfTp(tpceTp1Bldr, otnTp1, tpType, tpId, Map.of(stp.key(), stp), + mapping); + tpMap.put(ietfTpNw.key(),ietfTpNw); + break; + case XPONDERCLIENT: if (node.getXpdrCliConnectionMap().get(tpId.getValue()) != null) { tpceTp1Bldr.setAssociatedConnectionMapPort(node.getXpdrCliConnectionMap().get(tpId.getValue())); } - tpList.add(buildIetfTp(tpceTp1Bldr, otnTp1, tpType, tpId, null)); - } + TerminationPoint ietfTpCl = buildIetfTp(tpceTp1Bldr, otnTp1, tpType, tpId, null, mapping); + tpMap.put(ietfTpCl.key(),ietfTpCl); + break; + default: + LOG.error("Undefined tpType for Termination point {} of {}", tpId.getValue(), node.getNodeId()); + break; } } - private static Class fixRate(Class ifCapaType) { - switch (ifCapaType.getSimpleName()) { + private static Class fixRate(Class ifCapType) { + switch (ifCapType.getSimpleName()) { case "If100GEODU4": case "IfOCHOTU4ODU4": return ODU4.class; case "If1GEODU0": return ODU0.class; + case "If10GEODU2": + return ODU2.class; case "If10GEODU2e": return ODU2e.class; default: @@ -629,7 +681,37 @@ public final class OpenRoadmOtnTopology { } } - private static List createSupportingNodes(OtnTopoNode node) { + private static Class convertSupIfCapa(Class ifCapType) { + switch (ifCapType.getSimpleName()) { + case "IfOTUCnODUCn": + return IfOTUCnODUCn.class; + case "IfOCHOTU4ODU4": + return IfOCHOTU4ODU4.class; + case "IfOCH": + return IfOCH.class; + case "If100GEODU4": + return If100GEODU4.class; + case "If10GEODU2e": + return If10GEODU2e.class; + case "If10GEODU2": + return If10GEODU2.class; + case "If1GEODU0": + return If1GEODU0.class; + case "If400GE": + return If400GE.class; + case "If100GE": + return If100GE.class; + case "If10GE": + return If10GE.class; + case "If1GE": + return If1GE.class; + default: + return null; + } + } + + private static Map createSupportingNodes(OtnTopoNode node) { SupportingNode suppNode1 = new SupportingNodeBuilder() .setNetworkRef(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID)) .setNodeRef(new NodeId(node.getNodeId())) @@ -648,37 +730,36 @@ public final class OpenRoadmOtnTopology { .withKey(new SupportingNodeKey(new NetworkId(NetworkUtils.CLLI_NETWORK_ID), new NodeId(node.getClli()))) .build(); - List suppNodeList = new ArrayList<>(); - suppNodeList.add(suppNode1); - suppNodeList.add(suppNode2); - suppNodeList.add(suppNode3); - return suppNodeList; + Map suppNodeMap = new HashMap<>(); + suppNodeMap.put(suppNode1.key(),suppNode1); + suppNodeMap.put(suppNode2.key(),suppNode2); + suppNodeMap.put(suppNode3.key(),suppNode3); + return suppNodeMap; } private static TerminationPoint buildIetfTp( - org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.TerminationPoint1Builder tpceTp1Bldr, + org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019.TerminationPoint1Builder tpceTp1Bldr, TerminationPoint1 otnTp1, OpenroadmTpType tpType, TpId tpId, - List supportTpList) { + Map supportTpMap, Mapping mapping) { TerminationPointBuilder ietfTpBldr = new TerminationPointBuilder(); if (tpceTp1Bldr.getAssociatedConnectionMapPort() != null) { - ietfTpBldr.addAugmentation( - org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.TerminationPoint1.class, - tpceTp1Bldr.build()); + ietfTpBldr.addAugmentation(tpceTp1Bldr.build()); } - if (supportTpList != null) { - ietfTpBldr.setSupportingTerminationPoint(supportTpList); + if (supportTpMap != null) { + ietfTpBldr.setSupportingTerminationPoint(supportTpMap); } - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1 ocnTp = - new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1Builder() - .setTpType(tpType).build(); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1 ocnTp = + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1Builder() + .setTpType(tpType) + .setAdministrativeState(TopologyUtils.setNetworkAdminState(mapping.getPortAdminState())) + .setOperationalState(TopologyUtils.setNetworkOperState(mapping.getPortOperState())) + .build(); ietfTpBldr.setTpId(tpId) .withKey(new TerminationPointKey(tpId)) - .addAugmentation(TerminationPoint1.class, otnTp1) - .addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1.class, - ocnTp); + .addAugmentation(otnTp1) + .addAugmentation(ocnTp); return ietfTpBldr.build(); } }