X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=networkmodel%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fnetworkmodel%2FOrdLink.java;h=26c8f4b6dda256c2f6254dc3c895bcdf59aec8d8;hb=56d1795b647693ec1d620d6aca2c4003e3b302ca;hp=a479b1f646f6a4452d5d2a5f15efd4bb5bc9b347;hpb=e9ff01802d87203416f6af280c0590c22ed75538;p=transportpce.git diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/OrdLink.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/OrdLink.java index a479b1f64..26c8f4b6d 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/OrdLink.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/OrdLink.java @@ -8,27 +8,38 @@ package org.opendaylight.transportpce.networkmodel; +import com.google.common.util.concurrent.FluentFuture; +import java.util.Optional; import java.util.concurrent.ExecutionException; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.eclipse.jdt.annotation.NonNull; +import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.ReadTransaction; +import org.opendaylight.mdsal.binding.api.WriteTransaction; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.NetworkUtils; import org.opendaylight.transportpce.networkmodel.util.LinkIdUtil; -import org.opendaylight.transportpce.networkmodel.util.OpenRoadmFactory; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitRoadmNodesInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.Link1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.Link1Builder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.link.OMSAttributesBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmLinkType; +import org.opendaylight.transportpce.networkmodel.util.TopologyUtils; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.InitRoadmNodesInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Link1Builder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.TerminationPoint1; +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.rev211210.OpenroadmLinkType; 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; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.NetworkKey; +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.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.TpId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.Link; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.LinkBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.LinkKey; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPoint; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPointKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,33 +50,35 @@ final class OrdLink { /**Method to create OMS links if not discovered by LLDP. This is helpful to create test topologies using simulators**/ - public static boolean createRdm2RdmLinks(InitRoadmNodesInput input, - OpenRoadmFactory openRoadmFactory, DataBroker dataBroker) { + public static boolean createRdm2RdmLinks(InitRoadmNodesInput input, DataBroker dataBroker) { LinkId oppositeLinkId = LinkIdUtil.getRdm2RdmOppositeLinkId(input); - //For setting up attributes for openRoadm augment - Link1Builder link1Builder = new Link1Builder(); - OMSAttributesBuilder omsAttributesBuilder = new OMSAttributesBuilder(); - omsAttributesBuilder.setOppositeLink(oppositeLinkId); - link1Builder.setOMSAttributes(omsAttributesBuilder.build()); - //For opposite link augment - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1Builder oppsiteLinkBuilder = - new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1Builder(); - oppsiteLinkBuilder.setOppositeLink(oppositeLinkId); - link1Builder.setLinkType(OpenroadmLinkType.ROADMTOROADM); + Link1Builder oppsiteLinkBuilder = + new Link1Builder() + .setOppositeLink(oppositeLinkId) + .setLinkType(OpenroadmLinkType.ROADMTOROADM); String srcNode = new StringBuilder(input.getRdmANode()).append("-DEG").append(input.getDegANum()).toString(); String srcTp = input.getTerminationPointA(); String destNode = new StringBuilder(input.getRdmZNode()).append("-DEG").append(input.getDegZNum()).toString(); String destTp = input.getTerminationPointZ(); + // Check status of TPs to provide R2R link state + TerminationPoint rdmSrcTp = getTpofNode(srcNode, srcTp, dataBroker); + TerminationPoint rdmDstTp = getTpofNode(destNode, destTp, dataBroker); + if (State.InService.equals(rdmSrcTp.augmentation(TerminationPoint1.class).getOperationalState()) + && State.InService.equals(rdmDstTp.augmentation(TerminationPoint1.class).getOperationalState())) { + oppsiteLinkBuilder.setAdministrativeState(AdminStates.InService).setOperationalState(State.InService); + } else { + oppsiteLinkBuilder.setAdministrativeState(AdminStates.OutOfService).setOperationalState(State.OutOfService); + } + //IETF link builder - LinkBuilder linkBuilder = openRoadmFactory.createLink(srcNode, destNode, srcTp, destTp); + LinkBuilder linkBuilder = TopologyUtils.createLink(srcNode, destNode, srcTp, destTp, null); - linkBuilder.addAugmentation(Link1.class,link1Builder.build()); - linkBuilder.addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 - .Link1.class, oppsiteLinkBuilder.build()); + linkBuilder.addAugmentation(new Link1Builder().setOppositeLink(oppositeLinkId).build()); + linkBuilder.addAugmentation(oppsiteLinkBuilder.build()); LinkId linkId = LinkIdUtil.buildLinkId(srcNode, srcTp, destNode, destTp); // Building link instance identifier @@ -76,7 +89,7 @@ final class OrdLink { WriteTransaction writeTransaction = dataBroker.newWriteOnlyTransaction(); writeTransaction.merge(LogicalDatastoreType.CONFIGURATION, linkIID.build(), linkBuilder.build()); try { - writeTransaction.submit().get(); + writeTransaction.commit().get(); LOG.info("A new link with linkId: {} added into {} layer.", linkId.getValue(), NetworkUtils.OVERLAY_NETWORK_ID); return true; @@ -86,6 +99,33 @@ final class OrdLink { } } - private OrdLink(){ + private static TerminationPoint getTpofNode(String srcNode, String srcTp, DataBroker dataBroker) { + InstanceIdentifier iiTp = InstanceIdentifier.builder(Networks.class) + .child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID))) + .child(Node.class, new NodeKey(new NodeId(srcNode))) + .augmentation(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226 + .Node1.class) + .child(TerminationPoint.class, new TerminationPointKey(new TpId(srcTp))) + .build(); + @NonNull + ReadTransaction readTransaction = dataBroker.newReadOnlyTransaction(); + @NonNull + FluentFuture> tpFf = readTransaction.read(LogicalDatastoreType.CONFIGURATION, iiTp); + if (tpFf.isDone()) { + try { + Optional tpOpt; + tpOpt = tpFf.get(); + if (tpOpt.isPresent()) { + return tpOpt.get(); + } + } catch (InterruptedException | ExecutionException e) { + LOG.error("Impossible to get tp-id {} of node {} from {}", srcTp, srcNode, + NetworkUtils.OVERLAY_NETWORK_ID, e); + } + } + return null; + } + + private OrdLink() { } }