X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=networkmodel%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fnetworkmodel%2FOrdLink.java;h=c44203cf3a38cef4cddc873263f82c93b9b84297;hb=66ccddbe00692f230350a19e1a222f09d6abd9a7;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..c44203cf3 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/OrdLink.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/OrdLink.java @@ -9,9 +9,9 @@ package org.opendaylight.transportpce.networkmodel; 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.opendaylight.mdsal.binding.api.DataBroker; +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; @@ -45,16 +45,14 @@ final class OrdLink { 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()); + OMSAttributesBuilder omsAttributesBuilder = new OMSAttributesBuilder().setOppositeLink(oppositeLinkId); + Link1Builder link1Builder = new 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); + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.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(); @@ -76,7 +74,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;