X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-binding-broker%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fbinding%2Ftest%2Futil%2FBindingTestContext.java;h=01f432d12b6cb0682f6887c88b3690784b264257;hp=fef5715f50deea8ac6038b8684dc832c779cf582;hb=f99bc16b0122d2e0577033c76207d358311f1d99;hpb=d206d27042eef2185c875f85cf6eac61a1bd77c4 diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java index fef5715f50..01f432d12b 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java @@ -9,255 +9,163 @@ package org.opendaylight.controller.sal.binding.test.util; import static com.google.common.base.Preconditions.checkState; +import com.google.common.annotations.Beta; +import com.google.common.collect.ImmutableMap; +import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.common.util.concurrent.MoreExecutors; import java.util.Set; -import java.util.concurrent.Future; - -import javassist.ClassPool; - import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.impl.ForwardedBackwardsCompatibleDataBroker; -import org.opendaylight.controller.md.sal.binding.impl.ForwardedBindingDataBroker; +import org.opendaylight.controller.md.sal.binding.api.MountPointService; +import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService; +import org.opendaylight.controller.md.sal.binding.api.NotificationService; +import org.opendaylight.controller.md.sal.binding.compat.HeliumNotificationProviderServiceAdapter; +import org.opendaylight.controller.md.sal.binding.compat.HeliumRpcProviderRegistry; +import org.opendaylight.controller.md.sal.binding.impl.BindingDOMDataBrokerAdapter; +import org.opendaylight.controller.md.sal.binding.impl.BindingDOMMountPointServiceAdapter; +import org.opendaylight.controller.md.sal.binding.impl.BindingDOMNotificationPublishServiceAdapter; +import org.opendaylight.controller.md.sal.binding.impl.BindingDOMNotificationServiceAdapter; +import org.opendaylight.controller.md.sal.binding.impl.BindingDOMRpcProviderServiceAdapter; +import org.opendaylight.controller.md.sal.binding.impl.BindingDOMRpcServiceAdapter; +import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; -import org.opendaylight.controller.md.sal.dom.broker.impl.DOMDataBrokerImpl; -import org.opendaylight.controller.md.sal.dom.broker.impl.compat.BackwardsCompatibleDataBroker; +import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService; +import org.opendaylight.controller.md.sal.dom.api.DOMNotificationPublishService; +import org.opendaylight.controller.md.sal.dom.api.DOMNotificationService; +import org.opendaylight.controller.md.sal.dom.api.DOMRpcProviderService; +import org.opendaylight.controller.md.sal.dom.api.DOMRpcService; +import org.opendaylight.controller.md.sal.dom.broker.impl.DOMNotificationRouter; +import org.opendaylight.controller.md.sal.dom.broker.impl.DOMRpcRouter; +import org.opendaylight.controller.md.sal.dom.broker.impl.SerializedDOMDataBroker; +import org.opendaylight.controller.md.sal.dom.broker.impl.mount.DOMMountPointServiceImpl; import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore; +import org.opendaylight.controller.sal.binding.api.RpcConsumerRegistry; import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; -import org.opendaylight.controller.sal.binding.api.data.DataProviderService; -import org.opendaylight.controller.sal.binding.api.mount.MountProviderService; -import org.opendaylight.controller.sal.binding.impl.DataBrokerImpl; -import org.opendaylight.controller.sal.binding.impl.NotificationBrokerImpl; -import org.opendaylight.controller.sal.binding.impl.RpcProviderRegistryImpl; -import org.opendaylight.controller.sal.binding.impl.connect.dom.BindingDomConnectorDeployer; -import org.opendaylight.controller.sal.binding.impl.connect.dom.BindingIndependentConnector; -import org.opendaylight.controller.sal.binding.impl.forward.DomForwardedBindingBrokerImpl; -import org.opendaylight.controller.sal.core.api.Broker.ProviderSession; -import org.opendaylight.controller.sal.core.api.Broker.RoutedRpcRegistration; -import org.opendaylight.controller.sal.core.api.Broker.RpcRegistration; -import org.opendaylight.controller.sal.core.api.BrokerService; -import org.opendaylight.controller.sal.core.api.RpcImplementation; -import org.opendaylight.controller.sal.core.api.RpcProvisionRegistry; -import org.opendaylight.controller.sal.core.api.RpcRegistrationListener; -import org.opendaylight.controller.sal.core.api.mount.MountProvisionService; +import org.opendaylight.controller.sal.binding.impl.RootBindingAwareBroker; import org.opendaylight.controller.sal.core.spi.data.DOMStore; -import org.opendaylight.controller.sal.dom.broker.BrokerImpl; -import org.opendaylight.controller.sal.dom.broker.MountPointManagerImpl; -import org.opendaylight.controller.sal.dom.broker.impl.SchemaAwareRpcBroker; -import org.opendaylight.yangtools.concepts.ListenerRegistration; -import org.opendaylight.yangtools.sal.binding.generator.impl.ModuleInfoBackedContext; -import org.opendaylight.yangtools.sal.binding.generator.impl.RuntimeGeneratedMappingServiceImpl; +import org.opendaylight.mdsal.binding.dom.codec.impl.BindingNormalizedNodeCodecRegistry; +import org.opendaylight.mdsal.binding.generator.impl.GeneratedClassLoadingStrategy; +import org.opendaylight.mdsal.binding.generator.impl.ModuleInfoBackedContext; +import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; import org.opendaylight.yangtools.yang.binding.YangModuleInfo; -import org.opendaylight.yangtools.yang.binding.util.BindingReflections; -import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.common.RpcResult; -import org.opendaylight.yangtools.yang.data.api.CompositeNode; -import org.opendaylight.yangtools.yang.data.impl.codec.BindingIndependentMappingService; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.google.common.annotations.Beta; -import com.google.common.collect.ClassToInstanceMap; -import com.google.common.collect.ImmutableClassToInstanceMap; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.MutableClassToInstanceMap; -import com.google.common.util.concurrent.ListeningExecutorService; -import com.google.common.util.concurrent.MoreExecutors; @Beta public class BindingTestContext implements AutoCloseable { + private BindingToNormalizedNodeCodec codec; - public static final org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier TREE_ROOT = org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier - .builder().toInstance(); - - private static final Logger LOG = LoggerFactory.getLogger(BindingTestContext.class); + private RootBindingAwareBroker baBrokerImpl; - private RuntimeGeneratedMappingServiceImpl mappingServiceImpl; + private HeliumNotificationProviderServiceAdapter baNotifyImpl; - private DomForwardedBindingBrokerImpl baBrokerImpl; - private DataBrokerImpl baDataImpl; - private NotificationBrokerImpl baNotifyImpl; - private BindingIndependentConnector baConnectImpl; - - private org.opendaylight.controller.sal.dom.broker.DataBrokerImpl biDataImpl; - @SuppressWarnings("deprecation") - private org.opendaylight.controller.sal.core.api.data.DataProviderService biDataLegacyBroker; - private BrokerImpl biBrokerImpl; private final ListeningExecutorService executor; - private final ClassPool classPool; private final boolean startWithSchema; - private MountPointManagerImpl biMountImpl; - - + private DOMMountPointService biMountImpl; private ImmutableMap newDatastores; - private BackwardsCompatibleDataBroker biCompatibleBroker; - - @SuppressWarnings("deprecation") - private DataProviderService baData; - private DOMDataBroker newDOMDataBroker; private final MockSchemaService mockSchemaService = new MockSchemaService(); private DataBroker dataBroker; + private RpcConsumerRegistry baConsumerRpc; + + private BindingDOMRpcProviderServiceAdapter baProviderRpc; + private DOMRpcRouter domRouter; + private org.opendaylight.mdsal.dom.broker.DOMRpcRouter delegateDomRouter; + private NotificationPublishService publishService; + + private NotificationService listenService; + + private DOMNotificationPublishService domPublishService; + + private DOMNotificationService domListenService; + + private Set schemaModuleInfos; public DOMDataBroker getDomAsyncDataBroker() { - return newDOMDataBroker; + return this.newDOMDataBroker; + } + + public BindingToNormalizedNodeCodec getCodec() { + return this.codec; } - protected BindingTestContext(final ListeningExecutorService executor, final ClassPool classPool, final boolean startWithSchema) { + + protected BindingTestContext(final ListeningExecutorService executor, final boolean startWithSchema) { this.executor = executor; - this.classPool = classPool; this.startWithSchema = startWithSchema; } public void startDomDataBroker() { - checkState(executor != null, "Executor needs to be set"); - biDataImpl = new org.opendaylight.controller.sal.dom.broker.DataBrokerImpl(); - biDataImpl.setExecutor(executor); - biDataLegacyBroker = biDataImpl; } public void startNewDataBroker() { - checkState(executor != null, "Executor needs to be set"); - checkState(newDOMDataBroker != null, "DOM Data Broker must be set"); - dataBroker = new ForwardedBindingDataBroker(newDOMDataBroker, mappingServiceImpl, mockSchemaService); + checkState(this.executor != null, "Executor needs to be set"); + checkState(this.newDOMDataBroker != null, "DOM Data Broker must be set"); + this.dataBroker = new BindingDOMDataBrokerAdapter(this.newDOMDataBroker, this.codec); } public void startNewDomDataBroker() { - checkState(executor != null, "Executor needs to be set"); - InMemoryDOMDataStore operStore = new InMemoryDOMDataStore("OPER", executor, - MoreExecutors.sameThreadExecutor()); - InMemoryDOMDataStore configStore = new InMemoryDOMDataStore("CFG", executor, - MoreExecutors.sameThreadExecutor()); - newDatastores = ImmutableMap.builder() + checkState(this.executor != null, "Executor needs to be set"); + final InMemoryDOMDataStore operStore = new InMemoryDOMDataStore("OPER", + MoreExecutors.newDirectExecutorService()); + final InMemoryDOMDataStore configStore = new InMemoryDOMDataStore("CFG", + MoreExecutors.newDirectExecutorService()); + this.newDatastores = ImmutableMap.builder() .put(LogicalDatastoreType.OPERATIONAL, operStore) .put(LogicalDatastoreType.CONFIGURATION, configStore) .build(); - newDOMDataBroker = new DOMDataBrokerImpl(newDatastores, executor); - - biCompatibleBroker = new BackwardsCompatibleDataBroker(newDOMDataBroker,mockSchemaService); + this.newDOMDataBroker = new SerializedDOMDataBroker(this.newDatastores, this.executor); - mockSchemaService.registerSchemaContextListener(configStore); - mockSchemaService.registerSchemaContextListener(operStore); - biDataLegacyBroker = biCompatibleBroker; + this.mockSchemaService.registerSchemaContextListener(configStore); + this.mockSchemaService.registerSchemaContextListener(operStore); } public void startBindingDataBroker() { - checkState(executor != null, "Executor needs to be set"); - baDataImpl = new DataBrokerImpl(); - baDataImpl.setExecutor(executor); - baData = baDataImpl; + } public void startBindingBroker() { - checkState(executor != null, "Executor needs to be set"); - checkState(baData != null, "Binding Data Broker must be started"); - checkState(baNotifyImpl != null, "Notification Service must be started"); - baBrokerImpl = new DomForwardedBindingBrokerImpl("test"); - - baBrokerImpl.getMountManager().setDataCommitExecutor(executor); - baBrokerImpl.getMountManager().setNotificationExecutor(executor); - baBrokerImpl.setRpcBroker(new RpcProviderRegistryImpl("test")); - baBrokerImpl.setLegacyDataBroker(baData); - baBrokerImpl.setNotificationBroker(baNotifyImpl); - baBrokerImpl.start(); - } + checkState(this.executor != null, "Executor needs to be set"); + checkState(this.baNotifyImpl != null, "Notification Service must be started"); - public void startForwarding() { - checkState(baData != null, "Binding Data Broker needs to be started"); - checkState(biDataLegacyBroker != null, "DOM Data Broker needs to be started."); - checkState(mappingServiceImpl != null, "DOM Mapping Service needs to be started."); - - baConnectImpl = BindingDomConnectorDeployer.createConnector(getBindingToDomMappingService()); - baConnectImpl.setDomRpcRegistry(getDomRpcRegistry()); - baBrokerImpl.setConnector(baConnectImpl); - baBrokerImpl.setDomProviderContext(createMockContext()); - baBrokerImpl.startForwarding(); - } + this.baConsumerRpc = new BindingDOMRpcServiceAdapter(getDomRpcInvoker(), this.codec); + this.baProviderRpc = new BindingDOMRpcProviderServiceAdapter(getDomRpcRegistry(), this.codec); - private ProviderSession createMockContext() { + this.baBrokerImpl = new RootBindingAwareBroker("test"); - @SuppressWarnings("deprecation") - final ClassToInstanceMap domBrokerServices = ImmutableClassToInstanceMap - . builder() - // - .put(org.opendaylight.controller.sal.core.api.data.DataProviderService.class, biDataLegacyBroker) // - .put(RpcProvisionRegistry.class, biBrokerImpl.getRouter()) // - .put(MountProvisionService.class, biMountImpl) // - .build(); + final MountPointService mountService = new BindingDOMMountPointServiceAdapter(this.biMountImpl, this.codec); + this.baBrokerImpl.setMountService(mountService); + this.baBrokerImpl.setRpcBroker(new HeliumRpcProviderRegistry(this.baConsumerRpc, this.baProviderRpc)); + this.baBrokerImpl.setNotificationBroker(this.baNotifyImpl); + this.baBrokerImpl.start(); + } + + public void startForwarding() { - return new ProviderSession() { - - @Override - public Future> rpc(final QName rpc, final CompositeNode input) { - throw new UnsupportedOperationException(); - } - - @Override - public T getService(final Class service) { - return domBrokerServices.getInstance(service); - } - - @Override - public boolean isClosed() { - return false; - } - - @Override - public Set getSupportedRpcs() { - return null; - } - - @Override - public void close() { - } - - @Override - public ListenerRegistration addRpcRegistrationListener( - final RpcRegistrationListener listener) { - return null; - } - - @Override - public RpcRegistration addRpcImplementation(final QName rpcType, final RpcImplementation implementation) - throws IllegalArgumentException { - return null; - } - - @Override - public RoutedRpcRegistration addRoutedRpcImplementation(final QName rpcType, final RpcImplementation implementation) { - return null; - } - - @Override - public RoutedRpcRegistration addMountedRpcImplementation(final QName rpcType, final RpcImplementation implementation) { - return null; - } - }; } public void startBindingToDomMappingService() { - checkState(classPool != null, "ClassPool needs to be present"); - mappingServiceImpl = new RuntimeGeneratedMappingServiceImpl(classPool); - mockSchemaService.registerSchemaContextListener(mappingServiceImpl); + final BindingNormalizedNodeCodecRegistry codecRegistry = new BindingNormalizedNodeCodecRegistry(); + final GeneratedClassLoadingStrategy loading = GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy(); + this.codec = new BindingToNormalizedNodeCodec(loading, codecRegistry); + this.mockSchemaService.registerSchemaContextListener(this.codec); } - private void updateYangSchema(final ImmutableSet moduleInfos) { - mockSchemaService.changeSchema(getContext(moduleInfos)); + private void updateYangSchema(final Set moduleInfos) { + this.mockSchemaService.changeSchema(getContext(moduleInfos)); } - private SchemaContext getContext(final ImmutableSet moduleInfos) { - ModuleInfoBackedContext ctx = ModuleInfoBackedContext.create(); + private static SchemaContext getContext(final Set moduleInfos) { + final ModuleInfoBackedContext ctx = ModuleInfoBackedContext.create(); ctx.addModuleInfos(moduleInfos); return ctx.tryToCreateSchemaContext().get(); } @@ -269,91 +177,78 @@ public class BindingTestContext implements AutoCloseable { startDomMountPoint(); startBindingToDomMappingService(); startNewDataBroker(); - startNewBindingDataBroker(); startBindingNotificationBroker(); startBindingBroker(); startForwarding(); - if (startWithSchema) { + + if (schemaModuleInfos != null) { + updateYangSchema(schemaModuleInfos); + } else if (this.startWithSchema) { loadYangSchemaFromClasspath(); } } - public void startNewBindingDataBroker() { - ForwardedBackwardsCompatibleDataBroker forwarded = new ForwardedBackwardsCompatibleDataBroker(newDOMDataBroker, mappingServiceImpl,mockSchemaService, executor); - baData = forwarded; - } - private void startDomMountPoint() { - biMountImpl = new MountPointManagerImpl(); - biMountImpl.setDataBroker(getDomDataBroker()); + this.biMountImpl = new DOMMountPointServiceImpl(); } private void startDomBroker() { - checkState(executor != null); - - SchemaAwareRpcBroker router = new SchemaAwareRpcBroker("/", mockSchemaService); - ClassToInstanceMap services = MutableClassToInstanceMap.create(); - biBrokerImpl = new BrokerImpl(router,services); + checkState(this.executor != null); + delegateDomRouter = org.opendaylight.mdsal.dom.broker.DOMRpcRouter.newInstance(mockSchemaService); + this.domRouter = new DOMRpcRouter(delegateDomRouter.getRpcService(), delegateDomRouter.getRpcProviderService()); } public void startBindingNotificationBroker() { - checkState(executor != null); - baNotifyImpl = new NotificationBrokerImpl(executor); + checkState(this.executor != null); + final DOMNotificationRouter router = DOMNotificationRouter.create(16); + this.domPublishService = router; + this.domListenService = router; + this.publishService = new BindingDOMNotificationPublishServiceAdapter(this.codec, this.domPublishService); + this.listenService = new BindingDOMNotificationServiceAdapter(this.codec, this.domListenService); + this.baNotifyImpl = new HeliumNotificationProviderServiceAdapter(this.publishService,this.listenService); } public void loadYangSchemaFromClasspath() { - ImmutableSet moduleInfos = BindingReflections.loadModuleInfos(); - updateYangSchema(moduleInfos); - } - - @SuppressWarnings("deprecation") - public DataProviderService getBindingDataBroker() { - return baData; - } - - @SuppressWarnings("deprecation") - public org.opendaylight.controller.sal.core.api.data.DataProviderService getDomDataBroker() { - return biDataLegacyBroker; + updateYangSchema(BindingReflections.loadModuleInfos()); } - public BindingIndependentMappingService getBindingToDomMappingService() { - return mappingServiceImpl; + public RpcProviderRegistry getBindingRpcRegistry() { + return this.baBrokerImpl.getRoot(); } - public RpcProviderRegistry getBindingRpcRegistry() { - return baBrokerImpl.getRoot(); + public DOMRpcProviderService getDomRpcRegistry() { + return this.domRouter; } - public RpcProvisionRegistry getDomRpcRegistry() { - if (biBrokerImpl == null) { - return null; - } - return biBrokerImpl.getRouter(); + public DOMRpcService getDomRpcInvoker() { + return this.domRouter; } - public RpcImplementation getDomRpcInvoker() { - return biBrokerImpl.getRouter(); + public org.opendaylight.mdsal.dom.broker.DOMRpcRouter getDelegateDomRouter() { + return delegateDomRouter; } @Override - public void close() throws Exception { + public void close() { } - public MountProviderService getBindingMountProviderService() { - return baBrokerImpl.getMountManager(); + public MountPointService getBindingMountPointService() { + return this.baBrokerImpl.getMountService(); } - public MountProvisionService getDomMountProviderService() { - return biMountImpl; + public DOMMountPointService getDomMountProviderService() { + return this.biMountImpl; } public DataBroker getDataBroker() { - return dataBroker; + return this.dataBroker; } - + public void setSchemaModuleInfos(Set moduleInfos) { + this.schemaModuleInfos = moduleInfos; + } }