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=8e26cb6f957470edd036b537cd601275c84a5298;hp=e7880ac1bfbc17438f0f32c674f63516398dcd62;hb=dcc776a5e749d495a66e8753e123a1ddbd15d9c6;hpb=2611e6a728e586ea34dd891f30a473bf54d6cbd8 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 e7880ac1bf..8e26cb6f95 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 @@ -7,19 +7,14 @@ */ 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.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; @@ -27,22 +22,12 @@ 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.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; @@ -57,9 +42,7 @@ 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.DOMDataTreeReadTransaction; -import org.opendaylight.mdsal.dom.api.DOMDataTreeService; import org.opendaylight.mdsal.dom.api.DOMRpcImplementationRegistration; import org.opendaylight.mdsal.dom.api.DOMRpcProviderService; import org.opendaylight.mdsal.dom.api.DOMSchemaService; @@ -67,20 +50,12 @@ import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvid import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceRegistration; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.AddShardReplicaInput; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.AddShardReplicaOutput; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.BecomePrefixLeaderInput; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.BecomePrefixLeaderOutput; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.CheckPublishNotificationsInput; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.CheckPublishNotificationsOutput; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.CheckPublishNotificationsOutputBuilder; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.CreatePrefixShardInput; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.CreatePrefixShardOutput; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.DeconfigureIdIntsShardInput; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.DeconfigureIdIntsShardOutput; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.IsClientAbortedInput; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.IsClientAbortedOutput; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.OdlMdsalLowlevelControlService; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.ProduceTransactionsInput; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.ProduceTransactionsOutput; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.RegisterBoundConstantInput; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.RegisterBoundConstantOutput; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.RegisterBoundConstantOutputBuilder; @@ -95,13 +70,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.RegisterSingletonConstantInput; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.RegisterSingletonConstantOutput; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.RegisterSingletonConstantOutputBuilder; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.RemovePrefixShardInput; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.RemovePrefixShardOutput; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.RemoveShardReplicaInput; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.RemoveShardReplicaOutput; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.ShutdownPrefixShardReplicaInput; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.ShutdownPrefixShardReplicaOutput; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.ShutdownPrefixShardReplicaOutputBuilder; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.ShutdownShardReplicaInput; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.ShutdownShardReplicaOutput; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.ShutdownShardReplicaOutputBuilder; @@ -110,7 +80,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; @@ -133,7 +102,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; @@ -147,7 +115,6 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.RpcError.ErrorType; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -158,9 +125,7 @@ public class MdsalLowLevelTestProvider implements OdlMdsalLowlevelControlService private final RpcProviderService rpcRegistry; private final ObjectRegistration registration; - private final DistributedShardFactory distributedShardFactory; private final DistributedDataStoreInterface configDataStore; - private final DOMDataTreeService domDataTreeService; private final BindingNormalizedNodeSerializer bindingNormalizedNodeSerializer; private final DOMDataBroker domDataBroker; private final NotificationPublishService notificationPublishService; @@ -168,8 +133,6 @@ public class MdsalLowLevelTestProvider implements OdlMdsalLowlevelControlService 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; @@ -184,10 +147,6 @@ 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 RpcProviderService rpcRegistry, final DOMRpcProviderService domRpcService, @@ -197,8 +156,6 @@ public class MdsalLowLevelTestProvider implements OdlMdsalLowlevelControlService final NotificationPublishService notificationPublishService, final NotificationService notificationService, final DOMDataBroker domDataBroker, - final DOMDataTreeService domDataTreeService, - final DistributedShardFactory distributedShardFactory, final DistributedDataStoreInterface configDataStore, final ActorSystemProvider actorSystemProvider) { this.rpcRegistry = rpcRegistry; @@ -209,18 +166,12 @@ 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 = domDataBroker.getExtensions().getInstance(DOMDataTreeChangeService.class); registration = rpcRegistry.registerRpcImplementation(OdlMdsalLowlevelControlService.class, this); - - prefixShardHandler = new PrefixShardHandler(distributedShardFactory, domDataTreeService, - bindingNormalizedNodeSerializer); } @Override @@ -311,20 +262,6 @@ public class MdsalLowLevelTestProvider implements OdlMdsalLowlevelControlService return RpcResultBuilder.success(new SubscribeYnlOutputBuilder().build()).buildFuture(); } - @Override - public ListenableFuture> removePrefixShard(final RemovePrefixShardInput input) { - LOG.info("In removePrefixShard - input: {}", input); - - return prefixShardHandler.onRemovePrefixShard(input); - } - - @Override - public ListenableFuture> becomePrefixLeader( - final BecomePrefixLeaderInput input) { - LOG.info("n becomePrefixLeader - input: {}", input); - - return prefixLeaderHandler.makeLeaderLocal(input); - } @Override public ListenableFuture> unregisterBoundConstant( @@ -400,32 +337,12 @@ public class MdsalLowLevelTestProvider implements OdlMdsalLowlevelControlService @Override public ListenableFuture> addShardReplica(final AddShardReplicaInput input) { - return null; + throw new UnsupportedOperationException(); } @Override public ListenableFuture> subscribeDdtl(final SubscribeDdtlInput input) { - LOG.info("In subscribeDdtl"); - - if (ddtlReg != null) { - return RpcResultBuilder.failed().withError(ErrorType.RPC, - "data-exists", "There is already a listener registered for id-ints").buildFuture(); - } - - 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 RpcResultBuilder.failed().withError( - ErrorType.APPLICATION, "Failed to register DOMDataTreeListener", e).buildFuture(); - } - - return RpcResultBuilder.success(new SubscribeDdtlOutputBuilder().build()).buildFuture(); + throw new UnsupportedOperationException(); } @Override @@ -498,7 +415,7 @@ public class MdsalLowLevelTestProvider implements OdlMdsalLowlevelControlService } try (DOMDataTreeReadTransaction rTx = domDataBroker.newReadOnlyTransaction()) { - final Optional> readResult = rTx.read(LogicalDatastoreType.CONFIGURATION, + final Optional readResult = rTx.read(LogicalDatastoreType.CONFIGURATION, WriteTransactionsHandler.ID_INT_YID).get(); if (!readResult.isPresent()) { @@ -522,19 +439,6 @@ public class MdsalLowLevelTestProvider implements OdlMdsalLowlevelControlService } } - @Override - public ListenableFuture> createPrefixShard(final CreatePrefixShardInput input) { - LOG.info("In createPrefixShard - input: {}", input); - - return prefixShardHandler.onCreatePrefixShard(input); - } - - @Override - public ListenableFuture> deconfigureIdIntsShard( - final DeconfigureIdIntsShardInput input) { - return null; - } - @Override public ListenableFuture> unsubscribeYnl(final UnsubscribeYnlInput input) { LOG.info("In unsubscribeYnl - input: {}", input); @@ -578,13 +482,6 @@ public class MdsalLowLevelTestProvider implements OdlMdsalLowlevelControlService return RpcResultBuilder.success(output).buildFuture(); } - @Override - public ListenableFuture> produceTransactions( - final ProduceTransactionsInput input) { - LOG.info("In produceTransactions - input: {}", input); - return ProduceTransactionsHandler.start(domDataTreeService, input); - } - @Override public ListenableFuture> shutdownShardReplica( final ShutdownShardReplicaInput input) { @@ -599,24 +496,6 @@ public class MdsalLowLevelTestProvider implements OdlMdsalLowlevelControlService return shutdownShardGracefully(shardName, new ShutdownShardReplicaOutputBuilder().build()); } - @Override - public ListenableFuture> shutdownPrefixShardReplica( - final ShutdownPrefixShardReplicaInput input) { - LOG.info("shutdownPrefixShardReplica - input: {}", input); - - final InstanceIdentifier shardPrefix = input.getPrefix(); - - if (shardPrefix == null) { - return RpcResultBuilder.failed().withError(ErrorType.RPC, "bad-element", - "A valid shard prefix must be specified").buildFuture(); - } - - final YangInstanceIdentifier shardPath = bindingNormalizedNodeSerializer.toYangInstanceIdentifier(shardPrefix); - final String cleanPrefixShardName = ClusterUtils.getCleanShardName(shardPath); - - return shutdownShardGracefully(cleanPrefixShardName, new ShutdownPrefixShardReplicaOutputBuilder().build()); - } - private SettableFuture> shutdownShardGracefully(final String shardName, final T success) { final SettableFuture> rpcResult = SettableFuture.create(); final ActorUtils context = configDataStore.getActorUtils(); @@ -675,80 +554,12 @@ public class MdsalLowLevelTestProvider implements OdlMdsalLowlevelControlService @Override public ListenableFuture> unregisterDefaultConstant( final UnregisterDefaultConstantInput input) { - return null; + throw new UnsupportedOperationException(); } @Override @SuppressWarnings("checkstyle:IllegalCatch") public ListenableFuture> unsubscribeDdtl(final UnsubscribeDdtlInput input) { - LOG.info("In unsubscribeDdtl"); - - if (idIntsDdtl == null || ddtlReg == null) { - return RpcResultBuilder.failed().withError( - ErrorType.RPC, "data-missing", "No prior listener was registered").buildFuture(); - } - - long timeout = 120L; - try { - idIntsDdtl.tryFinishProcessing().get(timeout, TimeUnit.SECONDS); - } catch (InterruptedException | ExecutionException | TimeoutException e) { - LOG.error("Unable to finish notification processing", e); - return RpcResultBuilder.failed().withError(ErrorType.APPLICATION, - "Unable to finish notification processing in " + timeout + " seconds", e).buildFuture(); - } - - ddtlReg.close(); - ddtlReg = null; - - if (!idIntsDdtl.hasTriggered()) { - return RpcResultBuilder.failed().withError(ErrorType.APPLICATION, - "No notification received.", "id-ints listener has not received any notifications").buildFuture(); - } - - final String shardName = ClusterUtils.getCleanShardName(ProduceTransactionsHandler.ID_INTS_YID); - LOG.debug("Creating distributed datastore client for shard {}", shardName); - - final ActorUtils actorUtils = configDataStore.getActorUtils(); - final Props distributedDataStoreClientProps = - SimpleDataStoreClientActor.props(actorUtils.getCurrentMemberName(), - "Shard-" + shardName, actorUtils, 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()); - return RpcResultBuilder.failed() - .withError(ErrorType.APPLICATION, "Unable to create DataStoreClient for read", e).buildFuture(); - } - - 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 java.util.Optional> optional = read.get(); - if (!optional.isPresent()) { - return RpcResultBuilder.failed().withError(ErrorType.APPLICATION, - "data-missing", "Final read from id-ints is empty").buildFuture(); - } - - return RpcResultBuilder.success(new UnsubscribeDdtlOutputBuilder().setCopyMatches( - idIntsDdtl.checkEqual(optional.get()))).buildFuture(); - - } catch (InterruptedException | ExecutionException e) { - LOG.error("Unable to read data to verify ddtl data", e); - return RpcResultBuilder.failed() - .withError(ErrorType.APPLICATION, "Final read from id-ints failed", e).buildFuture(); - } finally { - distributedDataStoreClient.close(); - clientActor.tell(PoisonPill.getInstance(), noSender()); - } + throw new UnsupportedOperationException(); } }