import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public final class TopologyUtils {
+public final class TopologyUtils {
private static final Logger LOG = LoggerFactory.getLogger(TopologyUtils.class);
}
// This method returns the linkBuilder object for given source and destination
- public static LinkBuilder createLink(String srcNode, String dstNode, String srcTp, String destTp) {
+ public static LinkBuilder createLink(String srcNode, String dstNode, String srcTp, String destTp,
+ String otnPrefix) {
// Create Destination for link
- DestinationBuilder dstNodeBldr = new DestinationBuilder();
- dstNodeBldr.setDestTp(destTp);
- dstNodeBldr.setDestNode(new NodeId(dstNode));
+ DestinationBuilder dstNodeBldr = new DestinationBuilder()
+ .setDestTp(destTp)
+ .setDestNode(new NodeId(dstNode));
// Create Source for the link
- SourceBuilder srcNodeBldr = new SourceBuilder();
- srcNodeBldr.setSourceNode(new NodeId(srcNode));
- srcNodeBldr.setSourceTp(srcTp);
-
- // set link builder attribute
- LinkBuilder lnkBldr = new LinkBuilder();
-
- lnkBldr.setDestination(dstNodeBldr.build());
- lnkBldr.setSource(srcNodeBldr.build());
- lnkBldr.setLinkId(LinkIdUtil.buildLinkId(srcNode, srcTp, dstNode, destTp));
- lnkBldr.withKey(new LinkKey(lnkBldr.getLinkId()));
+ SourceBuilder srcNodeBldr = new SourceBuilder()
+ .setSourceNode(new NodeId(srcNode))
+ .setSourceTp(srcTp);
+ LinkId linkId;
+ LinkId oppositeLinkId;
+ if (otnPrefix == null) {
+ linkId = LinkIdUtil.buildLinkId(srcNode, srcTp, dstNode, destTp);
+ oppositeLinkId = LinkIdUtil.buildLinkId(dstNode, destTp, srcNode, srcTp);
+ } else {
+ linkId = LinkIdUtil.buildOtnLinkId(srcNode, srcTp, dstNode, destTp, otnPrefix);
+ oppositeLinkId = LinkIdUtil.buildOtnLinkId(dstNode, destTp, srcNode, srcTp, otnPrefix);
+ }
//set opposite link
- Link1Builder lnk1Bldr = new Link1Builder();
- LinkId oppositeLinkId = LinkIdUtil.getOppositeLinkId(srcNode, srcTp, dstNode, destTp);
- lnk1Bldr.setOppositeLink(oppositeLinkId);
- lnkBldr.addAugmentation(Link1.class,lnk1Bldr.build());
+ Link1 lnk1 = new Link1Builder().setOppositeLink(oppositeLinkId).build();
+
+ // set link builder attribute
+ LinkBuilder lnkBldr = new LinkBuilder()
+ .setDestination(dstNodeBldr.build())
+ .setSource(srcNodeBldr.build())
+ .setLinkId(linkId)
+ .withKey(new LinkKey(linkId))
+ .addAugmentation(Link1.class,lnk1);
return lnkBldr;
}
LOG.info("deleting link for {}-{}", srcNode, dstNode);
LinkId linkId = LinkIdUtil.buildLinkId(srcNode, srcTp, dstNode, destTp);
if (deleteLinkLinkId(linkId, networkTransactionService)) {
- LOG.debug("Link Id {} updated to have admin state down");
+ LOG.debug("Link Id {} updated to have admin state down", linkId);
return true;
} else {
LOG.debug("Link Id not found for Source {} and Dest {}", srcNode, dstNode);
// This method returns the linkBuilder object for given source and destination
public static boolean deleteLinkLinkId(LinkId linkId , NetworkTransactionService networkTransactionService) {
- LOG.info("deleting link for LinkId: {}", linkId);
+ LOG.info("deleting link for LinkId: {}", linkId.getValue());
try {
InstanceIdentifier.InstanceIdentifierBuilder<Link> linkIID = InstanceIdentifier.builder(Networks.class)
.child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)))
}
} catch (InterruptedException | ExecutionException | TimeoutException e) {
- LOG.error(e.getMessage(), e);
+ LOG.error("Error deleting link {}", linkId.getValue(), e);
return false;
}
}