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.OpenRoadmTopology;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.Link1;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.Link1Builder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.link.OMSAttributesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev170929.OpenroadmLinkType;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.Network;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.NetworkId;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.NetworkKey;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.LinkId;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.Network1;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.network.Link;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.network.LinkBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.network.LinkKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.networkutils.rev170818.InitRoadmNodesInput;
+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;
-public final class OrdLink {
+final class OrdLink {
private static final Logger LOG = LoggerFactory.getLogger(OrdLink.class);
/**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,
- OpenRoadmTopology openRoadmTopology, DataBroker dataBroker) {
+ to create test topologies using simulators**/
+ public static boolean createRdm2RdmLinks(InitRoadmNodesInput input, DataBroker dataBroker) {
LinkId oppositeLinkId = LinkIdUtil.getRdm2RdmOppositeLinkId(input);
- //For setting up attributes for openRoadm augment
- Link1Builder link1Builder = new Link1Builder();
- link1Builder.setLinkType(OpenroadmLinkType.ROADMTOROADM);
- OMSAttributesBuilder omsAttributesBuilder = new OMSAttributesBuilder();
- omsAttributesBuilder.setOppositeLink(oppositeLinkId);
- link1Builder.setOMSAttributes(omsAttributesBuilder.build());
-
//For opposite link augment
- org.opendaylight.yang.gen.v1.http.org.openroadm.opposite.links.rev170929.Link1Builder oppsiteLinkBuilder =
- new org.opendaylight.yang.gen.v1.http.org.openroadm.opposite.links.rev170929.Link1Builder();
- oppsiteLinkBuilder.setOppositeLink(oppositeLinkId);
-
+ 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 = openRoadmTopology.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.opposite.links.rev170929.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
- InstanceIdentifier.InstanceIdentifierBuilder<Link> linkIID =
- InstanceIdentifier.builder(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)))
+ InstanceIdentifier.InstanceIdentifierBuilder<Link> linkIID = InstanceIdentifier.builder(Networks.class)
+ .child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)))
.augmentation(Network1.class).child(Link.class, new LinkKey(linkId));
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);
+ linkId.getValue(), NetworkUtils.OVERLAY_NETWORK_ID);
return true;
} catch (InterruptedException | ExecutionException e) {
LOG.warn("Failed to create Roadm 2 Roadm Link for topo layer ");
return false;
}
}
+
+ private static TerminationPoint getTpofNode(String srcNode, String srcTp, DataBroker dataBroker) {
+ InstanceIdentifier<TerminationPoint> 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<Optional<TerminationPoint>> tpFf = readTransaction.read(LogicalDatastoreType.CONFIGURATION, iiTp);
+ if (tpFf.isDone()) {
+ try {
+ Optional<TerminationPoint> 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() {
+ }
}
Code Review / transportpce.git / blobdiff