X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fmessagebus-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmessagebus%2Fapp%2Fimpl%2FEventSourceTopology.java;h=7f53a53ac65275b6b79e3d8d68b1f5f4371e4532;hb=9799dc7bd1c6fde4135147abb8305131d7a1f1a5;hp=3aa470b10ad9940729043fd918a9727ffbf5ab84;hpb=cce450550bec259d4f925389bafd007676f2186f;p=controller.git diff --git a/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/messagebus/app/impl/EventSourceTopology.java b/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/messagebus/app/impl/EventSourceTopology.java index 3aa470b10a..7f53a53ac6 100644 --- a/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/messagebus/app/impl/EventSourceTopology.java +++ b/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/messagebus/app/impl/EventSourceTopology.java @@ -5,27 +5,31 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.controller.messagebus.app.impl; +import com.google.common.annotations.VisibleForTesting; import com.google.common.util.concurrent.FutureCallback; -import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.MoreExecutors; +import java.util.Collections; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.Future; -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.controller.messagebus.app.util.Util; import org.opendaylight.controller.messagebus.spi.EventSource; import org.opendaylight.controller.messagebus.spi.EventSourceRegistration; import org.opendaylight.controller.messagebus.spi.EventSourceRegistry; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcRegistration; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RpcRegistration; -import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; +import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; +import org.opendaylight.mdsal.binding.api.RpcProviderService; +import org.opendaylight.mdsal.binding.api.WriteTransaction; +import org.opendaylight.mdsal.common.api.CommitInfo; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.messagebus.eventaggregator.rev141202.CreateTopicInput; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.messagebus.eventaggregator.rev141202.CreateTopicOutput; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.messagebus.eventaggregator.rev141202.CreateTopicOutputBuilder; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.messagebus.eventaggregator.rev141202.DestroyTopicInput; +import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.messagebus.eventaggregator.rev141202.DestroyTopicOutput; +import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.messagebus.eventaggregator.rev141202.DestroyTopicOutputBuilder; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.messagebus.eventaggregator.rev141202.EventAggregatorService; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.messagebus.eventaggregator.rev141202.NotificationPattern; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.messagebus.eventaggregator.rev141202.TopicId; @@ -36,7 +40,6 @@ import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.messagebus.even import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.messagebus.eventsource.rev141202.TopologyTypes1Builder; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.messagebus.eventsource.rev141202.topology.event.source.type.TopologyEventSource; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.messagebus.eventsource.rev141202.topology.event.source.type.TopologyEventSourceBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeContext; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId; @@ -45,6 +48,8 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.TopologyTypes; +import org.opendaylight.yangtools.concepts.ObjectRegistration; +import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; @@ -52,7 +57,6 @@ import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - public class EventSourceTopology implements EventAggregatorService, EventSourceRegistry { private static final Logger LOG = LoggerFactory.getLogger(EventSourceTopology.class); @@ -61,89 +65,85 @@ public class EventSourceTopology implements EventAggregatorService, EventSourceR private static final LogicalDatastoreType OPERATIONAL = LogicalDatastoreType.OPERATIONAL; static final InstanceIdentifier EVENT_SOURCE_TOPOLOGY_PATH = - InstanceIdentifier.create(NetworkTopology.class) - .child(Topology.class, EVENT_SOURCE_TOPOLOGY_KEY); + InstanceIdentifier.create(NetworkTopology.class).child(Topology.class, EVENT_SOURCE_TOPOLOGY_KEY); - private static final InstanceIdentifier TOPOLOGY_TYPE_PATH = - EVENT_SOURCE_TOPOLOGY_PATH - .child(TopologyTypes.class) - .augmentation(TopologyTypes1.class); + private static final InstanceIdentifier TOPOLOGY_TYPE_PATH = EVENT_SOURCE_TOPOLOGY_PATH + .child(TopologyTypes.class).augmentation(TopologyTypes1.class); - private final Map eventSourceTopicMap = new ConcurrentHashMap<>(); - private final Map> routedRpcRegistrations = - new ConcurrentHashMap<>(); + private final Map eventSourceTopicMap = new ConcurrentHashMap<>(); + private final Map routedRpcRegistrations = new ConcurrentHashMap<>(); private final DataBroker dataBroker; - private final RpcRegistration aggregatorRpcReg; + private final ObjectRegistration aggregatorRpcReg; private final EventSourceService eventSourceService; - private final RpcProviderRegistry rpcRegistry; + private final RpcProviderService rpcRegistry; - public EventSourceTopology(final DataBroker dataBroker, final RpcProviderRegistry rpcRegistry) { + public EventSourceTopology(final DataBroker dataBroker, final RpcProviderService providerService, + RpcConsumerRegistry rpcService) { this.dataBroker = dataBroker; - this.rpcRegistry = rpcRegistry; - aggregatorRpcReg = rpcRegistry.addRpcImplementation(EventAggregatorService.class, this); - eventSourceService = rpcRegistry.getRpcService(EventSourceService.class); + this.rpcRegistry = providerService; + aggregatorRpcReg = providerService.registerRpcImplementation(EventAggregatorService.class, this); + eventSourceService = rpcService.getRpcService(EventSourceService.class); final TopologyEventSource topologySource = new TopologyEventSourceBuilder().build(); - final TopologyTypes1 topologyTypeAugment = new TopologyTypes1Builder().setTopologyEventSource(topologySource).build(); + final TopologyTypes1 topologyTypeAugment = + new TopologyTypes1Builder().setTopologyEventSource(topologySource).build(); putData(OPERATIONAL, TOPOLOGY_TYPE_PATH, topologyTypeAugment); LOG.info("EventSourceRegistry has been initialized"); } - private void putData(final LogicalDatastoreType store, + private void putData(final LogicalDatastoreType store, final InstanceIdentifier path, - final T data){ + final T data) { final WriteTransaction tx = getDataBroker().newWriteOnlyTransaction(); - tx.put(store, path, data, true); - Futures.addCallback( tx.submit(), new FutureCallback(){ - + tx.mergeParentStructurePut(store, path, data); + tx.commit().addCallback(new FutureCallback() { @Override - public void onSuccess(final Void result) { + public void onSuccess(final CommitInfo result) { LOG.trace("Data has put into datastore {} {}", store, path); } @Override - public void onFailure(final Throwable t) { - LOG.error("Can not put data into datastore [store: {}] [path: {}] [exception: {}]",store,path, t); + public void onFailure(final Throwable ex) { + LOG.error("Can not put data into datastore [store: {}] [path: {}]", store, path, ex); } - }); - + }, MoreExecutors.directExecutor()); } - private void deleteData(final LogicalDatastoreType store, final InstanceIdentifier path){ + private void deleteData(final LogicalDatastoreType store, + final InstanceIdentifier path) { final WriteTransaction tx = getDataBroker().newWriteOnlyTransaction(); tx.delete(OPERATIONAL, path); - Futures.addCallback( tx.submit(), new FutureCallback(){ - + tx.commit().addCallback(new FutureCallback() { @Override - public void onSuccess(final Void result) { + public void onSuccess(final CommitInfo result) { LOG.trace("Data has deleted from datastore {} {}", store, path); } @Override - public void onFailure(final Throwable t) { - LOG.error("Can not delete data from datastore [store: {}] [path: {}] [exception: {}]",store,path, t); + public void onFailure(final Throwable ex) { + LOG.error("Can not delete data from datastore [store: {}] [path: {}]", store, path, ex); } - - }); + }, MoreExecutors.directExecutor()); } private void insert(final KeyedInstanceIdentifier sourcePath) { final NodeKey nodeKey = sourcePath.getKey(); final InstanceIdentifier augmentPath = sourcePath.augmentation(Node1.class); - final Node1 nodeAgument = new Node1Builder().setEventSourceNode(new NodeId(nodeKey.getNodeId().getValue())).build(); + final Node1 nodeAgument = new Node1Builder().setEventSourceNode( + new NodeId(nodeKey.getNodeId().getValue())).build(); putData(OPERATIONAL, augmentPath, nodeAgument); } - private void remove(final KeyedInstanceIdentifier sourcePath){ + private void remove(final KeyedInstanceIdentifier sourcePath) { final InstanceIdentifier augmentPath = sourcePath.augmentation(Node1.class); deleteData(OPERATIONAL, augmentPath); } @Override - public Future> createTopic(final CreateTopicInput input) { + public ListenableFuture> createTopic(final CreateTopicInput input) { LOG.debug("Received Topic creation request: NotificationPattern -> {}, NodeIdPattern -> {}", input.getNotificationPattern(), input.getNodeIdPattern()); @@ -167,40 +167,36 @@ public class EventSourceTopology implements EventAggregatorService, EventSourceR } @Override - public Future> destroyTopic(final DestroyTopicInput input) { + public ListenableFuture> destroyTopic(final DestroyTopicInput input) { final EventSourceTopic topicToDestroy = eventSourceTopicMap.remove(input.getTopicId()); - if(topicToDestroy != null){ + if (topicToDestroy != null) { topicToDestroy.close(); } - return Util.resultRpcSuccessFor((Void) null); + return Util.resultRpcSuccessFor(new DestroyTopicOutputBuilder().build()); } @Override public void close() { aggregatorRpcReg.close(); - for(final EventSourceTopic est : eventSourceTopicMap.values()){ - est.close(); - } + eventSourceTopicMap.values().forEach(EventSourceTopic::close); } - public void register(final EventSource eventSource){ - + public void register(final EventSource eventSource) { final NodeKey nodeKey = eventSource.getSourceNodeKey(); final KeyedInstanceIdentifier sourcePath = EVENT_SOURCE_TOPOLOGY_PATH.child(Node.class, nodeKey); - final RoutedRpcRegistration reg = rpcRegistry.addRoutedRpcImplementation(EventSourceService.class, eventSource); - reg.registerPath(NodeContext.class, sourcePath); - routedRpcRegistrations.put(nodeKey,reg); + final Registration reg = rpcRegistry.registerRpcImplementation(EventSourceService.class, eventSource, + Collections.singleton(sourcePath)); + routedRpcRegistrations.put(nodeKey, reg); insert(sourcePath); - } - public void unRegister(final EventSource eventSource){ + public void unRegister(final EventSource eventSource) { final NodeKey nodeKey = eventSource.getSourceNodeKey(); final KeyedInstanceIdentifier sourcePath = EVENT_SOURCE_TOPOLOGY_PATH.child(Node.class, nodeKey); - final RoutedRpcRegistration removeRegistration = routedRpcRegistrations.remove(nodeKey); - if(removeRegistration != null){ + final Registration removeRegistration = routedRpcRegistrations.remove(nodeKey); + if (removeRegistration != null) { removeRegistration.close(); - remove(sourcePath); + remove(sourcePath); } } @@ -218,5 +214,14 @@ public class EventSourceTopology implements EventAggregatorService, EventSourceR EventSourceService getEventSourceService() { return eventSourceService; } -} + @VisibleForTesting + Map getRoutedRpcRegistrations() { + return routedRpcRegistrations; + } + + @VisibleForTesting + Map getEventSourceTopicMap() { + return eventSourceTopicMap; + } +}