X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=networkmodel%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fnetworkmodel%2FNetworkUtilsImpl.java;h=e464f75c768dd52aa99d29aed9f6a461ff730d08;hb=4493d1c0c0e16a522532a49a14638e2dbdc2f90d;hp=4f57a042c36b46e8223a0c94d50b40885bcde841;hpb=2c74d3b1109043024a1e251766ed6fcc39ffedf1;p=transportpce.git diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetworkUtilsImpl.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetworkUtilsImpl.java index 4f57a042c..e464f75c7 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetworkUtilsImpl.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetworkUtilsImpl.java @@ -7,138 +7,164 @@ */ package org.opendaylight.transportpce.networkmodel; -import com.google.common.base.Optional; +import com.google.common.collect.ClassToInstanceMap; +import com.google.common.collect.ImmutableClassToInstanceMap; import com.google.common.util.concurrent.ListenableFuture; - +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.ReadOnlyTransaction; -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.ReadTransaction; +import org.opendaylight.mdsal.binding.api.RpcProviderService; +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.OpenRoadmFactory; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.DeleteLinkInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.DeleteLinkOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.DeleteLinkOutputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitRdmXpdrLinksInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitRdmXpdrLinksOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitRdmXpdrLinksOutputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitRoadmNodesInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitRoadmNodesOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitRoadmNodesOutputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitXpdrRdmLinksInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitXpdrRdmLinksOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitXpdrRdmLinksOutputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.TransportpceNetworkutilsService; -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.LinkKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.DeleteLink; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.DeleteLinkInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.DeleteLinkOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.DeleteLinkOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.InitRdmXpdrLinks; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.InitRdmXpdrLinksInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.InitRdmXpdrLinksOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.InitRdmXpdrLinksOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.InitRoadmNodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.InitRoadmNodesInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.InitRoadmNodesOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.InitRoadmNodesOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.InitXpdrRdmLinks; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.InitXpdrRdmLinksInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.InitXpdrRdmLinksOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.InitXpdrRdmLinksOutputBuilder; +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.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.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.networks.network.Link; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.LinkKey; +import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.binding.Rpc; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; +import org.osgi.service.component.annotations.Activate; +import org.osgi.service.component.annotations.Component; +import org.osgi.service.component.annotations.Deactivate; +import org.osgi.service.component.annotations.Reference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class NetworkUtilsImpl implements TransportpceNetworkutilsService { +@Component +public class NetworkUtilsImpl { private static final Logger LOG = LoggerFactory.getLogger(NetworkUtilsImpl.class); private final DataBroker dataBroker; - private final OpenRoadmFactory openRoadmFactory; + private final Registration rpcReg; - public NetworkUtilsImpl(DataBroker dataBroker, OpenRoadmFactory openRoadmFactory) { + @Activate + public NetworkUtilsImpl(@Reference DataBroker dataBroker, @Reference RpcProviderService rpcProvider) { this.dataBroker = dataBroker; - this.openRoadmFactory = openRoadmFactory; + rpcReg = rpcProvider.registerRpcImplementations(getRpcClassToInstanceMap()); + LOG.info("NetworkUtilsImpl instanciated"); + } + + @Deactivate + public void close() { + rpcReg.close(); + LOG.info("{} closed", getClass().getSimpleName()); } - @Override - public ListenableFuture> deleteLink(DeleteLinkInput input) { + private ListenableFuture> deleteLink(DeleteLinkInput input) { LinkId linkId = new LinkId(input.getLinkId()); // Building link instance identifier - InstanceIdentifier.InstanceIdentifierBuilder linkIID = InstanceIdentifier - .builder(Network.class, - new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID))) + InstanceIdentifier.Builder 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)); //Check if link exists try { - ReadOnlyTransaction readOnlyTransaction = dataBroker.newReadOnlyTransaction(); + ReadTransaction readOnlyTransaction = dataBroker.newReadOnlyTransaction(); Optional linkOptional = readOnlyTransaction.read(LogicalDatastoreType.CONFIGURATION, linkIID.build()) .get(); if (!linkOptional.isPresent()) { LOG.info("Link not present"); return RpcResultBuilder - .success(new DeleteLinkOutputBuilder().setResult( - "Fail")) + .success(new DeleteLinkOutputBuilder().setResult("Fail").build()) .buildFuture(); } } catch (ExecutionException | InterruptedException e) { LOG.error("readMdSal: Error reading link {}", input.getLinkId()); return RpcResultBuilder - .success(new DeleteLinkOutputBuilder().setResult( - "Fail")) + .success(new DeleteLinkOutputBuilder().setResult("Fail").build()) .buildFuture(); } WriteTransaction writeTransaction = dataBroker.newWriteOnlyTransaction(); writeTransaction.delete(LogicalDatastoreType.CONFIGURATION, linkIID.build()); try { - writeTransaction.submit().get(); + writeTransaction.commit().get(); LOG.info("Link with linkId: {} deleted from {} layer.", input.getLinkId(), NetworkUtils.OVERLAY_NETWORK_ID); return RpcResultBuilder - .success(new DeleteLinkOutputBuilder().setResult( - "Link {} deleted successfully")) + .success(new DeleteLinkOutputBuilder().setResult("Link {} deleted successfully").build()) .buildFuture(); } catch (InterruptedException | ExecutionException e) { return RpcResultBuilder.failed().buildFuture(); } } - @Override - public ListenableFuture> initRoadmNodes(InitRoadmNodesInput input) { - boolean createRdmLinks = OrdLink.createRdm2RdmLinks(input, - this.openRoadmFactory,this.dataBroker); + private ListenableFuture> initRoadmNodes(InitRoadmNodesInput input) { + boolean createRdmLinks = OrdLink.createRdm2RdmLinks(input, this.dataBroker); if (createRdmLinks) { return RpcResultBuilder - .success(new InitRoadmNodesOutputBuilder().setResult( - "Unidirectional Roadm-to-Roadm Link created successfully")) + .success(new InitRoadmNodesOutputBuilder() + .setResult("Unidirectional Roadm-to-Roadm Link created successfully") + .build()) .buildFuture(); } else { return RpcResultBuilder.failed().buildFuture(); } } - @Override - public ListenableFuture> initXpdrRdmLinks(InitXpdrRdmLinksInput input) { + private ListenableFuture> initXpdrRdmLinks(InitXpdrRdmLinksInput input) { // Assigns user provided input in init-network-view RPC to nodeId LOG.info("Xpdr to Roadm links rpc called"); - boolean createXpdrRdmLinks = Rdm2XpdrLink.createXpdrRdmLinks(input.getLinksInput(), - this.openRoadmFactory,this.dataBroker); + boolean createXpdrRdmLinks = Rdm2XpdrLink.createXpdrRdmLinks(input.getLinksInput(), this.dataBroker); if (createXpdrRdmLinks) { return RpcResultBuilder - .success(new InitXpdrRdmLinksOutputBuilder().setResult("Xponder Roadm Link created successfully")) + .success(new InitXpdrRdmLinksOutputBuilder() + .setResult("Xponder Roadm Link created successfully") + .build()) .buildFuture(); } else { + LOG.error("init-xpdr-rdm-links rpc failed due to a bad input parameter"); return RpcResultBuilder.failed().buildFuture(); } } - @Override - public ListenableFuture> initRdmXpdrLinks(InitRdmXpdrLinksInput input) { - boolean createRdmXpdrLinks = Rdm2XpdrLink.createRdmXpdrLinks(input.getLinksInput(), - this.openRoadmFactory,this.dataBroker); + private ListenableFuture> initRdmXpdrLinks(InitRdmXpdrLinksInput input) { + LOG.info("Roadm to Xpdr links rpc called"); + boolean createRdmXpdrLinks = Rdm2XpdrLink.createRdmXpdrLinks(input.getLinksInput(), this.dataBroker); if (createRdmXpdrLinks) { return RpcResultBuilder - .success(new InitRdmXpdrLinksOutputBuilder().setResult("Roadm Xponder links created successfully")) + .success(new InitRdmXpdrLinksOutputBuilder() + .setResult("Roadm Xponder links created successfully") + .build()) .buildFuture(); } else { + LOG.error("init-rdm-xpdr-links rpc failed due to a bad input parameter"); return RpcResultBuilder.failed().buildFuture(); } } + + public final ClassToInstanceMap> getRpcClassToInstanceMap() { + return ImmutableClassToInstanceMap.>builder() + .put(DeleteLink.class, this::deleteLink) + .put(InitRoadmNodes.class, this::initRoadmNodes) + .put(InitXpdrRdmLinks.class, this::initXpdrRdmLinks) + .put(InitRdmXpdrLinks.class, this::initRdmXpdrLinks) + .build(); + } }