X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsamples%2Fclustering-test-app%2Fprovider%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fclustering%2Fit%2Fprovider%2FMdsalLowLevelTestProvider.java;h=abd725ebac375ac8b834c66ccc7deb1c52af8585;hp=da6df6b85584f88faea634346f8eed3b18f35fff;hb=5f587c3e2bfabc09fec49463d04a6fbeba414e9c;hpb=3f7ac86f0548d587e88ba43e03ec25cc83eed6cf diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/MdsalLowLevelTestProvider.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/MdsalLowLevelTestProvider.java index da6df6b855..abd725ebac 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/MdsalLowLevelTestProvider.java +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/MdsalLowLevelTestProvider.java @@ -5,66 +5,48 @@ * 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.clustering.it.provider; -import static akka.actor.ActorRef.noSender; - import akka.actor.ActorRef; import akka.actor.ActorSystem; -import akka.actor.PoisonPill; -import akka.actor.Props; import akka.dispatch.OnComplete; import akka.pattern.Patterns; -import com.google.common.base.Optional; import com.google.common.base.Strings; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import java.util.Collections; import java.util.HashMap; import java.util.Map; +import java.util.Optional; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import org.opendaylight.controller.cluster.ActorSystemProvider; -import org.opendaylight.controller.cluster.databroker.actors.dds.ClientLocalHistory; -import org.opendaylight.controller.cluster.databroker.actors.dds.ClientTransaction; -import org.opendaylight.controller.cluster.databroker.actors.dds.DataStoreClient; -import org.opendaylight.controller.cluster.databroker.actors.dds.SimpleDataStoreClientActor; import org.opendaylight.controller.cluster.datastore.DistributedDataStoreInterface; -import org.opendaylight.controller.cluster.datastore.utils.ActorContext; +import org.opendaylight.controller.cluster.datastore.utils.ActorUtils; import org.opendaylight.controller.cluster.datastore.utils.ClusterUtils; import org.opendaylight.controller.cluster.raft.client.messages.Shutdown; -import org.opendaylight.controller.cluster.sharding.DistributedShardFactory; import org.opendaylight.controller.clustering.it.provider.impl.FlappingSingletonService; import org.opendaylight.controller.clustering.it.provider.impl.GetConstantService; -import org.opendaylight.controller.clustering.it.provider.impl.IdIntsDOMDataTreeLIstener; import org.opendaylight.controller.clustering.it.provider.impl.IdIntsListener; -import org.opendaylight.controller.clustering.it.provider.impl.PrefixLeaderHandler; -import org.opendaylight.controller.clustering.it.provider.impl.PrefixShardHandler; -import org.opendaylight.controller.clustering.it.provider.impl.ProduceTransactionsHandler; import org.opendaylight.controller.clustering.it.provider.impl.PublishNotificationsTask; import org.opendaylight.controller.clustering.it.provider.impl.RoutedGetConstantService; import org.opendaylight.controller.clustering.it.provider.impl.SingletonGetConstantService; import org.opendaylight.controller.clustering.it.provider.impl.WriteTransactionsHandler; import org.opendaylight.controller.clustering.it.provider.impl.YnlListener; -import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService; -import org.opendaylight.controller.md.sal.binding.api.NotificationService; -import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; -import org.opendaylight.controller.md.sal.dom.api.DOMDataReadOnlyTransaction; -import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeListener; -import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeService; -import org.opendaylight.controller.md.sal.dom.api.DOMRpcImplementationRegistration; -import org.opendaylight.controller.md.sal.dom.api.DOMRpcProviderService; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; -import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; -import org.opendaylight.controller.sal.core.api.model.SchemaService; +import org.opendaylight.mdsal.binding.api.NotificationPublishService; +import org.opendaylight.mdsal.binding.api.NotificationService; +import org.opendaylight.mdsal.binding.api.RpcProviderService; import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; +import org.opendaylight.mdsal.dom.api.DOMDataBroker; +import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener; +import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeService; import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; -import org.opendaylight.mdsal.dom.api.DOMDataTreeLoopException; -import org.opendaylight.mdsal.dom.api.DOMDataTreeService; +import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction; +import org.opendaylight.mdsal.dom.api.DOMRpcImplementationRegistration; +import org.opendaylight.mdsal.dom.api.DOMRpcProviderService; +import org.opendaylight.mdsal.dom.api.DOMSchemaService; import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider; import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceRegistration; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.AddShardReplicaInput; @@ -112,7 +94,6 @@ import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.l import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.StartPublishNotificationsOutputBuilder; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.SubscribeDdtlInput; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.SubscribeDdtlOutput; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.SubscribeDdtlOutputBuilder; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.SubscribeDtclInput; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.SubscribeDtclOutput; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.SubscribeDtclOutputBuilder; @@ -135,7 +116,6 @@ import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.l import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.UnregisterSingletonConstantOutputBuilder; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.UnsubscribeDdtlInput; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.UnsubscribeDdtlOutput; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.UnsubscribeDdtlOutputBuilder; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.UnsubscribeDtclInput; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.UnsubscribeDtclOutput; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.UnsubscribeDtclOutputBuilder; @@ -144,8 +124,8 @@ import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.l import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.WriteTransactionsInput; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.WriteTransactionsOutput; import org.opendaylight.yangtools.concepts.ListenerRegistration; +import org.opendaylight.yangtools.concepts.ObjectRegistration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.common.RpcError.ErrorType; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; @@ -156,25 +136,18 @@ import org.slf4j.LoggerFactory; import scala.concurrent.duration.FiniteDuration; public class MdsalLowLevelTestProvider implements OdlMdsalLowlevelControlService { - private static final Logger LOG = LoggerFactory.getLogger(MdsalLowLevelTestProvider.class); - private static final org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType CONTROLLER_CONFIG = - org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType.CONFIGURATION; - private final RpcProviderRegistry rpcRegistry; - private final BindingAwareBroker.RpcRegistration registration; - private final DistributedShardFactory distributedShardFactory; + private final RpcProviderService rpcRegistry; + private final ObjectRegistration registration; private final DistributedDataStoreInterface configDataStore; - private final DOMDataTreeService domDataTreeService; private final BindingNormalizedNodeSerializer bindingNormalizedNodeSerializer; private final DOMDataBroker domDataBroker; private final NotificationPublishService notificationPublishService; private final NotificationService notificationService; - private final SchemaService schemaService; + private final DOMSchemaService schemaService; private final ClusterSingletonServiceProvider singletonService; private final DOMRpcProviderService domRpcService; - private final PrefixLeaderHandler prefixLeaderHandler; - private final PrefixShardHandler prefixShardHandler; private final DOMDataTreeChangeService domDataTreeChangeService; private final ActorSystem actorSystem; @@ -189,21 +162,15 @@ public class MdsalLowLevelTestProvider implements OdlMdsalLowlevelControlService private ListenerRegistration dtclReg; private IdIntsListener idIntsListener; private final Map publishNotificationsTasks = new HashMap<>(); - private ListenerRegistration ddtlReg; - private IdIntsDOMDataTreeLIstener idIntsDdtl; - - - public MdsalLowLevelTestProvider(final RpcProviderRegistry rpcRegistry, + public MdsalLowLevelTestProvider(final RpcProviderService rpcRegistry, final DOMRpcProviderService domRpcService, final ClusterSingletonServiceProvider singletonService, - final SchemaService schemaService, + final DOMSchemaService schemaService, final BindingNormalizedNodeSerializer bindingNormalizedNodeSerializer, final NotificationPublishService notificationPublishService, final NotificationService notificationService, final DOMDataBroker domDataBroker, - final DOMDataTreeService domDataTreeService, - final DistributedShardFactory distributedShardFactory, final DistributedDataStoreInterface configDataStore, final ActorSystemProvider actorSystemProvider) { this.rpcRegistry = rpcRegistry; @@ -214,92 +181,73 @@ public class MdsalLowLevelTestProvider implements OdlMdsalLowlevelControlService this.notificationPublishService = notificationPublishService; this.notificationService = notificationService; this.domDataBroker = domDataBroker; - this.domDataTreeService = domDataTreeService; - this.distributedShardFactory = distributedShardFactory; this.configDataStore = configDataStore; this.actorSystem = actorSystemProvider.getActorSystem(); - this.prefixLeaderHandler = new PrefixLeaderHandler(domDataTreeService, bindingNormalizedNodeSerializer); - - domDataTreeChangeService = - (DOMDataTreeChangeService) domDataBroker.getSupportedExtensions().get(DOMDataTreeChangeService.class); + domDataTreeChangeService = domDataBroker.getExtensions().getInstance(DOMDataTreeChangeService.class); - registration = rpcRegistry.addRpcImplementation(OdlMdsalLowlevelControlService.class, this); - - prefixShardHandler = new PrefixShardHandler(distributedShardFactory, domDataTreeService, - bindingNormalizedNodeSerializer); + registration = rpcRegistry.registerRpcImplementation(OdlMdsalLowlevelControlService.class, this); } @Override @SuppressWarnings("checkstyle:IllegalCatch") public ListenableFuture> unregisterSingletonConstant( final UnregisterSingletonConstantInput input) { - LOG.debug("unregister-singleton-constant"); + LOG.info("In unregisterSingletonConstant"); if (getSingletonConstantRegistration == null) { - LOG.debug("No get-singleton-constant registration present."); - final RpcError rpcError = RpcResultBuilder.newError(ErrorType.APPLICATION, "missing-registration", - "No get-singleton-constant rpc registration present."); - final RpcResult result = - RpcResultBuilder.failed().withRpcError(rpcError).build(); - return Futures.immediateFuture(result); + return RpcResultBuilder.failed().withError(ErrorType.RPC, "data-missing", + "No prior RPC was registered").buildFuture(); } try { getSingletonConstantRegistration.close(); getSingletonConstantRegistration = null; - return Futures.immediateFuture(RpcResultBuilder.success( - new UnregisterSingletonConstantOutputBuilder().build()).build()); + return RpcResultBuilder.success(new UnregisterSingletonConstantOutputBuilder().build()).buildFuture(); } catch (Exception e) { - LOG.debug("There was a problem closing the singleton constant service", e); - final RpcError rpcError = RpcResultBuilder.newError(ErrorType.APPLICATION, "error-closing", - "There was a problem closing get-singleton-constant"); - final RpcResult result = - RpcResultBuilder.failed().withRpcError(rpcError).build(); - return Futures.immediateFuture(result); + String msg = "Error closing the singleton constant service"; + LOG.error(msg, e); + return RpcResultBuilder.failed().withError( + ErrorType.APPLICATION, msg, e).buildFuture(); } } @Override public ListenableFuture> startPublishNotifications( final StartPublishNotificationsInput input) { - LOG.debug("publish-notifications, input: {}", input); + LOG.info("In startPublishNotifications - input: {}", input); final PublishNotificationsTask task = new PublishNotificationsTask(notificationPublishService, input.getId(), - input.getSeconds(), input.getNotificationsPerSecond()); + input.getSeconds().toJava(), input.getNotificationsPerSecond().toJava()); publishNotificationsTasks.put(input.getId(), task); task.start(); - return Futures.immediateFuture(RpcResultBuilder.success(new StartPublishNotificationsOutputBuilder().build()) - .build()); + return RpcResultBuilder.success(new StartPublishNotificationsOutputBuilder().build()).buildFuture(); } @Override public ListenableFuture> subscribeDtcl(final SubscribeDtclInput input) { + LOG.info("In subscribeDtcl - input: {}", input); if (dtclReg != null) { - final RpcError error = RpcResultBuilder.newError(ErrorType.RPC, "Registration present.", - "There is already dataTreeChangeListener registered on id-ints list."); - return Futures.immediateFuture(RpcResultBuilder.failed().withRpcError(error).build()); + return RpcResultBuilder.failed().withError(ErrorType.RPC, + "data-exists", "There is already a DataTreeChangeListener registered for id-ints").buildFuture(); } idIntsListener = new IdIntsListener(); - dtclReg = domDataTreeChangeService - .registerDataTreeChangeListener( - new org.opendaylight.controller.md.sal.dom.api.DOMDataTreeIdentifier( - CONTROLLER_CONFIG, WriteTransactionsHandler.ID_INT_YID), - idIntsListener); + dtclReg = domDataTreeChangeService.registerDataTreeChangeListener( + new DOMDataTreeIdentifier(LogicalDatastoreType.CONFIGURATION, WriteTransactionsHandler.ID_INT_YID), + idIntsListener); - return Futures.immediateFuture(RpcResultBuilder.success(new SubscribeDtclOutputBuilder().build()).build()); + return RpcResultBuilder.success(new SubscribeDtclOutputBuilder().build()).buildFuture(); } @Override public ListenableFuture> writeTransactions(final WriteTransactionsInput input) { - LOG.debug("write-transactions, input: {}", input); return WriteTransactionsHandler.start(domDataBroker, input); } @@ -316,76 +264,61 @@ public class MdsalLowLevelTestProvider implements OdlMdsalLowlevelControlService @Override public ListenableFuture> subscribeYnl(final SubscribeYnlInput input) { - - LOG.debug("subscribe-ynl, input: {}", input); + LOG.info("In subscribeYnl - input: {}", input); if (ynlRegistrations.containsKey(input.getId())) { - final RpcError error = RpcResultBuilder.newError(ErrorType.RPC, "Registration present.", - "There is already ynl listener registered for this id: " + input.getId()); - return Futures.immediateFuture(RpcResultBuilder.failed().withRpcError(error).build()); + return RpcResultBuilder.failed().withError(ErrorType.RPC, + "data-exists", "There is already a listener registered for id: " + input.getId()).buildFuture(); } ynlRegistrations.put(input.getId(), notificationService.registerNotificationListener(new YnlListener(input.getId()))); - return Futures.immediateFuture(RpcResultBuilder.success(new SubscribeYnlOutputBuilder().build()).build()); + return RpcResultBuilder.success(new SubscribeYnlOutputBuilder().build()).buildFuture(); } @Override public ListenableFuture> removePrefixShard(final RemovePrefixShardInput input) { - LOG.debug("remove-prefix-shard, input: {}", input); - - return prefixShardHandler.onRemovePrefixShard(input); + throw new UnsupportedOperationException(); } @Override public ListenableFuture> becomePrefixLeader( final BecomePrefixLeaderInput input) { - LOG.debug("become-prefix-leader, input: {}", input); - - return prefixLeaderHandler.makeLeaderLocal(input); + throw new UnsupportedOperationException(); } @Override public ListenableFuture> unregisterBoundConstant( final UnregisterBoundConstantInput input) { - LOG.debug("unregister-bound-constant, {}", input); + LOG.info("In unregisterBoundConstant - {}", input); final DOMRpcImplementationRegistration rpcRegistration = routedRegistrations.remove(input.getContext()); if (rpcRegistration == null) { - LOG.debug("No get-contexted-constant registration for context: {}", input.getContext()); - final RpcError rpcError = RpcResultBuilder.newError(ErrorType.APPLICATION, "missing-registration", - "No get-constant rpc registration present."); - final RpcResult result = - RpcResultBuilder.failed().withRpcError(rpcError).build(); - return Futures.immediateFuture(result); + return RpcResultBuilder.failed().withError( + ErrorType.RPC, "data-missing", "No prior RPC was registered for " + input.getContext()).buildFuture(); } rpcRegistration.close(); - return Futures.immediateFuture(RpcResultBuilder.success(new UnregisterBoundConstantOutputBuilder().build()) - .build()); + return RpcResultBuilder.success(new UnregisterBoundConstantOutputBuilder().build()).buildFuture(); } @Override public ListenableFuture> registerSingletonConstant( final RegisterSingletonConstantInput input) { - - LOG.debug("Received register-singleton-constant rpc, input: {}", input); + LOG.info("In registerSingletonConstant - input: {}", input); if (input.getConstant() == null) { - final RpcError error = RpcResultBuilder.newError( - ErrorType.RPC, "Invalid input.", "Constant value is null"); - return Futures.immediateFuture(RpcResultBuilder.failed() - .withRpcError(error).build()); + return RpcResultBuilder.failed().withError( + ErrorType.RPC, "invalid-value", "Constant value is null").buildFuture(); } getSingletonConstantRegistration = SingletonGetConstantService.registerNew(singletonService, domRpcService, input.getConstant()); - return Futures.immediateFuture(RpcResultBuilder.success(new RegisterSingletonConstantOutputBuilder().build()) - .build()); + return RpcResultBuilder.success(new RegisterSingletonConstantOutputBuilder().build()).buildFuture(); } @Override @@ -397,12 +330,11 @@ public class MdsalLowLevelTestProvider implements OdlMdsalLowlevelControlService @Override public ListenableFuture> unregisterConstant( final UnregisterConstantInput input) { + LOG.info("In unregisterConstant"); if (globalGetConstantRegistration == null) { - final RpcError rpcError = RpcResultBuilder.newError(ErrorType.APPLICATION, "missing-registration", - "No get-constant rpc registration present."); - return Futures.immediateFuture(RpcResultBuilder.failed().withRpcError(rpcError) - .build()); + return RpcResultBuilder.failed().withError( + ErrorType.RPC, "data-missing", "No prior RPC was registered").buildFuture(); } globalGetConstantRegistration.close(); @@ -414,77 +346,48 @@ public class MdsalLowLevelTestProvider implements OdlMdsalLowlevelControlService @Override public ListenableFuture> unregisterFlappingSingleton( final UnregisterFlappingSingletonInput input) { - LOG.debug("unregister-flapping-singleton received."); + LOG.info("In unregisterFlappingSingleton"); if (flappingSingletonService == null) { - final RpcError rpcError = RpcResultBuilder.newError(ErrorType.APPLICATION, "missing-registration", - "No flapping-singleton registration present."); - final RpcResult result = - RpcResultBuilder.failed().withRpcError(rpcError).build(); - return Futures.immediateFuture(result); + return RpcResultBuilder.failed().withError( + ErrorType.RPC, "data-missing", "No prior RPC was registered").buildFuture(); } final long flapCount = flappingSingletonService.setInactive(); flappingSingletonService = null; - final UnregisterFlappingSingletonOutput output = - new UnregisterFlappingSingletonOutputBuilder().setFlapCount(flapCount).build(); - - return Futures.immediateFuture(RpcResultBuilder.success(output).build()); + return RpcResultBuilder.success(new UnregisterFlappingSingletonOutputBuilder().setFlapCount(flapCount).build()) + .buildFuture(); } @Override public ListenableFuture> addShardReplica(final AddShardReplicaInput input) { - return null; + throw new UnsupportedOperationException(); } @Override public ListenableFuture> subscribeDdtl(final SubscribeDdtlInput input) { - - if (ddtlReg != null) { - final RpcError error = RpcResultBuilder.newError(ErrorType.RPC, "Registration present.", - "There is already dataTreeChangeListener registered on id-ints list."); - return Futures.immediateFuture(RpcResultBuilder.failed().withRpcError(error).build()); - } - - idIntsDdtl = new IdIntsDOMDataTreeLIstener(); - - try { - ddtlReg = domDataTreeService.registerListener(idIntsDdtl, - Collections.singleton(new DOMDataTreeIdentifier(LogicalDatastoreType.CONFIGURATION, - ProduceTransactionsHandler.ID_INT_YID)), - true, Collections.emptyList()); - } catch (DOMDataTreeLoopException e) { - LOG.error("Failed to register DOMDataTreeListener.", e); - } - - return Futures.immediateFuture(RpcResultBuilder.success(new SubscribeDdtlOutputBuilder().build()).build()); + throw new UnsupportedOperationException(); } @Override public ListenableFuture> registerBoundConstant( final RegisterBoundConstantInput input) { - LOG.debug("register-bound-constant: {}", input); + LOG.info("In registerBoundConstant - input: {}", input); if (input.getContext() == null) { - final RpcError error = RpcResultBuilder.newError( - ErrorType.RPC, "Invalid input.", "Context value is null"); - return Futures.immediateFuture(RpcResultBuilder.failed().withRpcError(error) - .build()); + return RpcResultBuilder.failed().withError( + ErrorType.RPC, "invalid-value", "Context value is null").buildFuture(); } if (input.getConstant() == null) { - final RpcError error = RpcResultBuilder.newError( - ErrorType.RPC, "Invalid input.", "Constant value is null"); - return Futures.immediateFuture(RpcResultBuilder.failed().withRpcError(error) - .build()); + return RpcResultBuilder.failed().withError( + ErrorType.RPC, "invalid-value", "Constant value is null").buildFuture(); } if (routedRegistrations.containsKey(input.getContext())) { - final RpcError error = RpcResultBuilder.newError(ErrorType.RPC, "Registration present.", - "There is already a rpc registered for context: " + input.getContext()); - return Futures.immediateFuture(RpcResultBuilder.failed().withRpcError(error) - .build()); + return RpcResultBuilder.failed().withError(ErrorType.RPC, + "data-exists", "There is already an rpc registered for context: " + input.getContext()).buildFuture(); } final DOMRpcImplementationRegistration rpcRegistration = @@ -492,89 +395,78 @@ public class MdsalLowLevelTestProvider implements OdlMdsalLowlevelControlService input.getConstant(), input.getContext()); routedRegistrations.put(input.getContext(), rpcRegistration); - return Futures.immediateFuture(RpcResultBuilder.success(new RegisterBoundConstantOutputBuilder().build()) - .build()); + return RpcResultBuilder.success(new RegisterBoundConstantOutputBuilder().build()).buildFuture(); } @Override public ListenableFuture> registerFlappingSingleton( final RegisterFlappingSingletonInput input) { - LOG.debug("Received register-flapping-singleton."); + LOG.info("In registerFlappingSingleton"); if (flappingSingletonService != null) { - final RpcError error = RpcResultBuilder.newError( - ErrorType.RPC, "Registration present.", "flapping-singleton already registered"); - return Futures.immediateFuture(RpcResultBuilder.failed() - .withRpcError(error).build()); + return RpcResultBuilder.failed().withError(ErrorType.RPC, + "data-exists", "There is already an rpc registered").buildFuture(); } flappingSingletonService = new FlappingSingletonService(singletonService); - return Futures.immediateFuture(RpcResultBuilder.success(new RegisterFlappingSingletonOutputBuilder().build()) - .build()); + return RpcResultBuilder.success(new RegisterFlappingSingletonOutputBuilder().build()).buildFuture(); } @Override public ListenableFuture> unsubscribeDtcl(final UnsubscribeDtclInput input) { - LOG.debug("Received unsubscribe-dtcl"); + LOG.info("In unsubscribeDtcl"); if (idIntsListener == null || dtclReg == null) { - final RpcError error = RpcResultBuilder.newError( - ErrorType.RPC, "Dtcl missing.", "No DataTreeChangeListener registered."); - return Futures.immediateFuture(RpcResultBuilder.failed() - .withRpcError(error).build()); + return RpcResultBuilder.failed().withError( + ErrorType.RPC, "data-missing", "No prior listener was registered").buildFuture(); } + long timeout = 120L; try { - idIntsListener.tryFinishProcessing().get(120, TimeUnit.SECONDS); + idIntsListener.tryFinishProcessing().get(timeout, TimeUnit.SECONDS); } catch (InterruptedException | ExecutionException | TimeoutException e) { - final RpcError error = RpcResultBuilder.newError(ErrorType.RPC, "resource-denied-transport", - "Unable to finish notification processing in 120 seconds.", "clustering-it", "clustering-it", e); - return Futures.immediateFuture(RpcResultBuilder.failed() - .withRpcError(error).build()); + LOG.error("Unable to finish notification processing", e); + return RpcResultBuilder.failed().withError(ErrorType.APPLICATION, + "Unable to finish notification processing in " + timeout + " seconds", e).buildFuture(); } dtclReg.close(); dtclReg = null; if (!idIntsListener.hasTriggered()) { - final RpcError error = RpcResultBuilder.newError( - ErrorType.APPLICATION, "No notification received.", "id-ints listener has not received" - + "any notifications."); - return Futures.immediateFuture(RpcResultBuilder.failed() - .withRpcError(error).build()); + return RpcResultBuilder.failed().withError(ErrorType.APPLICATION, "operation-failed", + "id-ints listener has not received any notifications.").buildFuture(); } - final DOMDataReadOnlyTransaction rTx = domDataBroker.newReadOnlyTransaction(); - try { - final Optional> readResult = - rTx.read(CONTROLLER_CONFIG, WriteTransactionsHandler.ID_INT_YID).get(); + try (DOMDataTreeReadTransaction rTx = domDataBroker.newReadOnlyTransaction()) { + final Optional> readResult = rTx.read(LogicalDatastoreType.CONFIGURATION, + WriteTransactionsHandler.ID_INT_YID).get(); if (!readResult.isPresent()) { - final RpcError error = RpcResultBuilder.newError( - ErrorType.APPLICATION, "Final read empty.", "No data read from id-ints list."); - return Futures.immediateFuture(RpcResultBuilder.failed() - .withRpcError(error).build()); + return RpcResultBuilder.failed().withError(ErrorType.APPLICATION, "data-missing", + "No data read from id-ints list").buildFuture(); } - return Futures.immediateFuture( - RpcResultBuilder.success(new UnsubscribeDtclOutputBuilder() - .setCopyMatches(idIntsListener.checkEqual(readResult.get()))).build()); + final boolean nodesEqual = idIntsListener.checkEqual(readResult.get()); + if (!nodesEqual) { + LOG.error("Final read of id-int does not match IdIntsListener's copy. {}", + idIntsListener.diffWithLocalCopy(readResult.get())); + } - } catch (final InterruptedException | ExecutionException e) { - final RpcError error = RpcResultBuilder.newError( - ErrorType.APPLICATION, "Read failed.", "Final read from id-ints failed."); - return Futures.immediateFuture(RpcResultBuilder.failed() - .withRpcError(error).build()); + return RpcResultBuilder.success(new UnsubscribeDtclOutputBuilder().setCopyMatches(nodesEqual)) + .buildFuture(); + } catch (final InterruptedException | ExecutionException e) { + LOG.error("Final read of id-ints failed", e); + return RpcResultBuilder.failed().withError(ErrorType.APPLICATION, + "Final read of id-ints failed", e).buildFuture(); } } @Override public ListenableFuture> createPrefixShard(final CreatePrefixShardInput input) { - LOG.debug("create-prefix-shard, input: {}", input); - - return prefixShardHandler.onCreatePrefixShard(input); + throw new UnsupportedOperationException(); } @Override @@ -585,14 +477,11 @@ public class MdsalLowLevelTestProvider implements OdlMdsalLowlevelControlService @Override public ListenableFuture> unsubscribeYnl(final UnsubscribeYnlInput input) { - LOG.debug("Received unsubscribe-ynl, input: {}", input); + LOG.info("In unsubscribeYnl - input: {}", input); if (!ynlRegistrations.containsKey(input.getId())) { - final RpcError rpcError = RpcResultBuilder.newError(ErrorType.APPLICATION, "missing-registration", - "No ynl listener with this id registered."); - final RpcResult result = - RpcResultBuilder.failed().withRpcError(rpcError).build(); - return Futures.immediateFuture(result); + return RpcResultBuilder.failed().withError( + ErrorType.RPC, "data-missing", "No prior listener was registered for " + input.getId()).buildFuture(); } final ListenerRegistration reg = ynlRegistrations.remove(input.getId()); @@ -600,12 +489,13 @@ public class MdsalLowLevelTestProvider implements OdlMdsalLowlevelControlService reg.close(); - return Futures.immediateFuture(RpcResultBuilder.success().withResult(output).build()); + return RpcResultBuilder.success().withResult(output).buildFuture(); } @Override public ListenableFuture> checkPublishNotifications( final CheckPublishNotificationsInput input) { + LOG.info("In checkPublishNotifications - input: {}", input); final PublishNotificationsTask task = publishNotificationsTasks.get(input.getId()); @@ -625,27 +515,24 @@ public class MdsalLowLevelTestProvider implements OdlMdsalLowlevelControlService final CheckPublishNotificationsOutput output = checkPublishNotificationsOutputBuilder.setPublishCount(task.getCurrentNotif()).build(); - return Futures.immediateFuture(RpcResultBuilder.success(output).build()); + return RpcResultBuilder.success(output).buildFuture(); } @Override public ListenableFuture> produceTransactions( final ProduceTransactionsInput input) { - LOG.debug("producer-transactions, input: {}", input); - return ProduceTransactionsHandler.start(domDataTreeService, input); + throw new UnsupportedOperationException(); } @Override public ListenableFuture> shutdownShardReplica( final ShutdownShardReplicaInput input) { - LOG.debug("Received shutdown-shard-replica rpc, input: {}", input); + LOG.info("In shutdownShardReplica - input: {}", input); final String shardName = input.getShardName(); if (Strings.isNullOrEmpty(shardName)) { - final RpcError rpcError = RpcResultBuilder.newError(ErrorType.APPLICATION, "bad-element", - "A valid shard name must be specified"); - return Futures.immediateFuture(RpcResultBuilder.failed().withRpcError(rpcError) - .build()); + return RpcResultBuilder.failed().withError(ErrorType.RPC, "bad-element", + shardName + "is not a valid shard name").buildFuture(); } return shutdownShardGracefully(shardName, new ShutdownShardReplicaOutputBuilder().build()); @@ -654,15 +541,13 @@ public class MdsalLowLevelTestProvider implements OdlMdsalLowlevelControlService @Override public ListenableFuture> shutdownPrefixShardReplica( final ShutdownPrefixShardReplicaInput input) { - LOG.debug("Received shutdown-prefix-shard-replica rpc, input: {}", input); + LOG.info("shutdownPrefixShardReplica - input: {}", input); final InstanceIdentifier shardPrefix = input.getPrefix(); if (shardPrefix == null) { - final RpcError rpcError = RpcResultBuilder.newError(ErrorType.APPLICATION, "bad-element", - "A valid shard prefix must be specified"); - return Futures.immediateFuture(RpcResultBuilder.failed() - .withRpcError(rpcError).build()); + return RpcResultBuilder.failed().withError(ErrorType.RPC, "bad-element", + "A valid shard prefix must be specified").buildFuture(); } final YangInstanceIdentifier shardPath = bindingNormalizedNodeSerializer.toYangInstanceIdentifier(shardPrefix); @@ -673,7 +558,7 @@ public class MdsalLowLevelTestProvider implements OdlMdsalLowlevelControlService private SettableFuture> shutdownShardGracefully(final String shardName, final T success) { final SettableFuture> rpcResult = SettableFuture.create(); - final ActorContext context = configDataStore.getActorContext(); + final ActorUtils context = configDataStore.getActorUtils(); long timeoutInMS = Math.max(context.getDatastoreContext().getShardRaftConfig() .getElectionTimeOutInterval().$times(3).toMillis(), 10000); @@ -682,7 +567,7 @@ public class MdsalLowLevelTestProvider implements OdlMdsalLowlevelControlService context.findLocalShardAsync(shardName).onComplete(new OnComplete() { @Override - public void onComplete(final Throwable throwable, final ActorRef actorRef) throws Throwable { + public void onComplete(final Throwable throwable, final ActorRef actorRef) { if (throwable != null) { shutdownShardAsk.failure(throwable); } else { @@ -693,7 +578,7 @@ public class MdsalLowLevelTestProvider implements OdlMdsalLowlevelControlService shutdownShardAsk.future().onComplete(new OnComplete() { @Override - public void onComplete(final Throwable throwable, final Boolean gracefulStopResult) throws Throwable { + public void onComplete(final Throwable throwable, final Boolean gracefulStopResult) { if (throwable != null) { final RpcResult failedResult = RpcResultBuilder.failed() .withError(ErrorType.APPLICATION, "Failed to gracefully shutdown shard", throwable).build(); @@ -710,118 +595,31 @@ public class MdsalLowLevelTestProvider implements OdlMdsalLowlevelControlService @Override public ListenableFuture> registerConstant(final RegisterConstantInput input) { - - LOG.debug("Received register-constant rpc, input: {}", input); + LOG.info("In registerConstant - input: {}", input); if (input.getConstant() == null) { - final RpcError error = RpcResultBuilder.newError( - ErrorType.RPC, "Invalid input.", "Constant value is null"); - return Futures.immediateFuture(RpcResultBuilder.failed().withRpcError(error) - .build()); + return RpcResultBuilder.failed().withError( + ErrorType.RPC, "invalid-value", "Constant value is null").buildFuture(); } if (globalGetConstantRegistration != null) { - final RpcError error = RpcResultBuilder.newError(ErrorType.RPC, "Registration present.", - "There is already a get-constant rpc registered."); - return Futures.immediateFuture(RpcResultBuilder.failed().withRpcError(error) - .build()); + return RpcResultBuilder.failed().withError(ErrorType.RPC, + "data-exists", "There is already an rpc registered").buildFuture(); } globalGetConstantRegistration = GetConstantService.registerNew(domRpcService, input.getConstant()); - return Futures.immediateFuture(RpcResultBuilder.success(new RegisterConstantOutputBuilder().build()).build()); + return RpcResultBuilder.success(new RegisterConstantOutputBuilder().build()).buildFuture(); } @Override public ListenableFuture> unregisterDefaultConstant( final UnregisterDefaultConstantInput input) { - return null; + throw new UnsupportedOperationException(); } @Override @SuppressWarnings("checkstyle:IllegalCatch") public ListenableFuture> unsubscribeDdtl(final UnsubscribeDdtlInput input) { - LOG.debug("Received unsubscribe-ddtl."); - - if (idIntsDdtl == null || ddtlReg == null) { - final RpcError error = RpcResultBuilder.newError( - ErrorType.RPC, "Ddtl missing.", "No DOMDataTreeListener registered."); - return Futures.immediateFuture(RpcResultBuilder.failed() - .withRpcError(error).build()); - } - - try { - idIntsDdtl.tryFinishProcessing().get(120, TimeUnit.SECONDS); - } catch (InterruptedException | ExecutionException | TimeoutException e) { - final RpcError error = RpcResultBuilder.newError(ErrorType.RPC, "resource-denied-transport", - "Unable to finish notification processing in 120 seconds.", "clustering-it", "clustering-it", e); - return Futures.immediateFuture(RpcResultBuilder.failed() - .withRpcError(error).build()); - } - - ddtlReg.close(); - ddtlReg = null; - - if (!idIntsDdtl.hasTriggered()) { - final RpcError error = RpcResultBuilder.newError( - ErrorType.APPLICATION, "No notification received.", "id-ints listener has not received" - + "any notifications."); - return Futures.immediateFuture(RpcResultBuilder.failed() - .withRpcError(error).build()); - } - - final String shardName = ClusterUtils.getCleanShardName(ProduceTransactionsHandler.ID_INTS_YID); - LOG.debug("Creating distributed datastore client for shard {}", shardName); - - final ActorContext actorContext = configDataStore.getActorContext(); - final Props distributedDataStoreClientProps = - SimpleDataStoreClientActor.props(actorContext.getCurrentMemberName(), - "Shard-" + shardName, actorContext, shardName); - - final ActorRef clientActor = actorSystem.actorOf(distributedDataStoreClientProps); - final DataStoreClient distributedDataStoreClient; - try { - distributedDataStoreClient = SimpleDataStoreClientActor - .getDistributedDataStoreClient(clientActor, 30, TimeUnit.SECONDS); - } catch (RuntimeException e) { - LOG.error("Failed to get actor for {}", distributedDataStoreClientProps, e); - clientActor.tell(PoisonPill.getInstance(), noSender()); - final RpcError error = RpcResultBuilder.newError( - ErrorType.APPLICATION, "Unable to create ds client for read.", - "Unable to create ds client for read."); - return Futures.immediateFuture(RpcResultBuilder.failed() - .withRpcError(error).build()); - } - - final ClientLocalHistory localHistory = distributedDataStoreClient.createLocalHistory(); - final ClientTransaction tx = localHistory.createTransaction(); - final ListenableFuture>> read = - tx.read(YangInstanceIdentifier.of(ProduceTransactionsHandler.ID_INT)); - - tx.abort(); - localHistory.close(); - try { - final Optional> optional = read.get(); - if (!optional.isPresent()) { - LOG.warn("Final read from client is empty."); - final RpcError error = RpcResultBuilder.newError( - ErrorType.APPLICATION, "Read failed.", "Final read from id-ints is empty."); - return Futures.immediateFuture(RpcResultBuilder.failed() - .withRpcError(error).build()); - } - - return Futures.immediateFuture( - RpcResultBuilder.success(new UnsubscribeDdtlOutputBuilder() - .setCopyMatches(idIntsDdtl.checkEqual(optional.get()))).build()); - - } catch (InterruptedException | ExecutionException e) { - LOG.error("Unable to read data to verify ddtl data.", e); - final RpcError error = RpcResultBuilder.newError( - ErrorType.APPLICATION, "Read failed.", "Final read from id-ints failed."); - return Futures.immediateFuture(RpcResultBuilder.failed() - .withRpcError(error).build()); - } finally { - distributedDataStoreClient.close(); - clientActor.tell(PoisonPill.getInstance(), noSender()); - } + throw new UnsupportedOperationException(); } }