X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-binding-broker%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fbinding%2Ftest%2Futil%2FBindingTestContext.java;h=d0a326adff83054ff99cbc9e0b1278dde8ed6ad4;hb=698468cfa4cdc7d5ff7dfe0639058fea3e5d7d5b;hp=623b2fdd6365c5f14d3948d2b567ab65c81435cd;hpb=87142a0c2c300231ac49f017519d86d994569a32;p=controller.git 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 623b2fdd63..5227f30e3c 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,412 +9,253 @@ package org.opendaylight.controller.sal.binding.test.util; import static com.google.common.base.Preconditions.checkState; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; +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.impl.ForwardedBackwardsCompatibleDataBroker; +import org.opendaylight.controller.md.sal.binding.api.DataBroker; +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.data.DataStore; -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.DataStoreStatsWrapper; -import org.opendaylight.controller.sal.dom.broker.impl.HashMapDataStore; -import org.opendaylight.controller.sal.dom.broker.impl.SchemaAwareDataStoreAdapter; -import org.opendaylight.controller.sal.dom.broker.impl.SchemaAwareRpcBroker; -import org.opendaylight.yangtools.concepts.ListenerRegistration; -import org.opendaylight.yangtools.sal.binding.generator.impl.RuntimeGeneratedMappingServiceImpl; -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.Module; +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.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl; -import org.reflections.Reflections; -import org.reflections.scanners.ResourcesScanner; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.google.common.base.Predicate; -import com.google.common.collect.ClassToInstanceMap; -import com.google.common.collect.ImmutableClassToInstanceMap; -import com.google.common.collect.ImmutableMap; -import com.google.common.util.concurrent.ListeningExecutorService; +@Beta public class BindingTestContext implements AutoCloseable { + private BindingToNormalizedNodeCodec codec; - public static final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier TREE_ROOT = org.opendaylight.yangtools.yang.data.api.InstanceIdentifier - .builder().toInstance(); - - private static final Logger LOG = LoggerFactory.getLogger(BindingTestContext.class); - - private RuntimeGeneratedMappingServiceImpl mappingServiceImpl; + private RootBindingAwareBroker baBrokerImpl; - private DomForwardedBindingBrokerImpl baBrokerImpl; - private DataBrokerImpl baDataImpl; - private NotificationBrokerImpl baNotifyImpl; - private BindingIndependentConnector baConnectImpl; + private HeliumNotificationProviderServiceAdapter baNotifyImpl; - private org.opendaylight.controller.sal.dom.broker.DataBrokerImpl biDataImpl; - private org.opendaylight.controller.sal.core.api.data.DataProviderService biDataLegacyBroker; - private BrokerImpl biBrokerImpl; - private HashMapDataStore rawDataStore; - private SchemaAwareDataStoreAdapter schemaAwareDataStore; - private DataStoreStatsWrapper dataStoreStats; - private DataStore dataStore; - - private final boolean dataStoreStatisticsEnabled = false; private final ListeningExecutorService executor; - private final ClassPool classPool; private final boolean startWithSchema; - private MountPointManagerImpl biMountImpl; + private DOMMountPointService biMountImpl; + private ImmutableMap newDatastores; + private DOMDataBroker newDOMDataBroker; - private ImmutableMap newDatastores; + private final MockSchemaService mockSchemaService = new MockSchemaService(); - private BackwardsCompatibleDataBroker biCompatibleBroker; + private DataBroker dataBroker; - private DataProviderService baData; + private RpcConsumerRegistry baConsumerRpc; - private DOMDataBroker newDOMDataBroker; + private BindingDOMRpcProviderServiceAdapter baProviderRpc; + private DOMRpcRouter domRouter; + private org.opendaylight.mdsal.dom.broker.DOMRpcRouter delegateDomRouter; - private final MockSchemaService mockSchemaService = new MockSchemaService(); + 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; } @Deprecated - public void startDomDataStore() { - checkState(dataStore == null, "DataStore already started."); - checkState(biDataImpl != null, "Dom Data Broker not present"); - rawDataStore = new HashMapDataStore(); - schemaAwareDataStore = new SchemaAwareDataStoreAdapter(); - schemaAwareDataStore.changeDelegate(rawDataStore); - if (dataStoreStatisticsEnabled) { - dataStoreStats = new DataStoreStatsWrapper(schemaAwareDataStore); - dataStore = dataStoreStats; - } else { - dataStore = schemaAwareDataStore; - } - mockSchemaService.registerSchemaServiceListener(schemaAwareDataStore); - biDataImpl.registerConfigurationReader(TREE_ROOT, dataStore); - biDataImpl.registerOperationalReader(TREE_ROOT, dataStore); - biDataImpl.registerCommitHandler(TREE_ROOT, dataStore); + protected BindingTestContext(final ListeningExecutorService executor, final ClassPool classPool, + final boolean startWithSchema) { + this(executor, 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(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); - InMemoryDOMDataStore configStore = new InMemoryDOMDataStore("CFG", executor); - 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); + this.newDOMDataBroker = new SerializedDOMDataBroker(this.newDatastores, this.executor); - mockSchemaService.registerSchemaServiceListener(configStore); - mockSchemaService.registerSchemaServiceListener(operStore); - mockSchemaService.registerSchemaServiceListener(biCompatibleBroker); - 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(); } - 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(); - } + public void startBindingBroker() { + checkState(this.executor != null, "Executor needs to be set"); + checkState(this.baNotifyImpl != null, "Notification Service must be started"); - private ProviderSession createMockContext() { + this.baConsumerRpc = new BindingDOMRpcServiceAdapter(getDomRpcInvoker(), this.codec); + this.baProviderRpc = new BindingDOMRpcProviderServiceAdapter(getDomRpcRegistry(), this.codec); - 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(); + this.baBrokerImpl = new RootBindingAwareBroker("test"); - 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; - } - }; + 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 startBindingToDomMappingService() { - checkState(classPool != null, "ClassPool needs to be present"); - mappingServiceImpl = new RuntimeGeneratedMappingServiceImpl(classPool); - mockSchemaService.registerSchemaServiceListener(mappingServiceImpl); - } + public void startForwarding() { - public void updateYangSchema(final String[] files) { - mockSchemaService.changeSchema(getContext(files)); } - public static String[] getAllYangFilesOnClasspath() { - Predicate predicate = new Predicate() { - @Override - public boolean apply(final String input) { - return input.endsWith(".yang"); - } - }; - Reflections reflection = new Reflections("META-INF.yang", new ResourcesScanner()); - Set result = reflection.getResources(predicate); - return result.toArray(new String[result.size()]); + public void startBindingToDomMappingService() { + final BindingNormalizedNodeCodecRegistry codecRegistry = new BindingNormalizedNodeCodecRegistry(); + final GeneratedClassLoadingStrategy loading = GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy(); + this.codec = new BindingToNormalizedNodeCodec(loading, codecRegistry); + this.mockSchemaService.registerSchemaContextListener(this.codec); } - private static SchemaContext getContext(final String[] yangFiles) { - ClassLoader loader = BindingTestContext.class.getClassLoader(); - List streams = new ArrayList<>(); - for (String string : yangFiles) { - InputStream stream = loader.getResourceAsStream(string); - streams.add(stream); - } - YangParserImpl parser = new YangParserImpl(); - Set modules = parser.parseYangModelsFromStreams(streams); - return parser.resolveSchemaContext(modules); + private void updateYangSchema(final Set moduleInfos) { + this.mockSchemaService.changeSchema(getContext(moduleInfos)); } - public void startLegacy() { - startBindingDataBroker(); - startBindingNotificationBroker(); - startBindingBroker(); - startDomDataBroker(); - startDomDataStore(); - startDomBroker(); - startDomMountPoint(); - startBindingToDomMappingService(); - startForwarding(); - if (startWithSchema) { - loadYangSchemaFromClasspath(); - } + private static SchemaContext getContext(final Set moduleInfos) { + final ModuleInfoBackedContext ctx = ModuleInfoBackedContext.create(); + ctx.addModuleInfos(moduleInfos); + return ctx.tryToCreateSchemaContext().get(); } public void start() { startNewDomDataBroker(); + startDomBroker(); startDomMountPoint(); startBindingToDomMappingService(); - startNewBindingDataBroker(); - + startNewDataBroker(); 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); - biBrokerImpl = new BrokerImpl(); - biBrokerImpl.setRouter(new SchemaAwareRpcBroker("/", mockSchemaService)); + 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() { - String[] files = getAllYangFilesOnClasspath(); - updateYangSchema(files); + updateYangSchema(BindingReflections.loadModuleInfos()); } - public DataProviderService getBindingDataBroker() { - return baData; - } - - public org.opendaylight.controller.sal.core.api.data.DataProviderService getDomDataBroker() { - return biDataLegacyBroker; + public RpcProviderRegistry getBindingRpcRegistry() { + return this.baBrokerImpl.getRoot(); } - public DataStore getDomDataStore() { - return dataStore; + public DOMRpcProviderService getDomRpcRegistry() { + return this.domRouter; } - public BindingIndependentMappingService getBindingToDomMappingService() { - return mappingServiceImpl; + public DOMRpcService getDomRpcInvoker() { + return this.domRouter; } - public void logDataStoreStatistics() { - if (dataStoreStats == null) { - return; - } - - LOG.info("BIDataStore Statistics: Configuration Read Count: {} TotalTime: {} ms AverageTime (ns): {} ms", - dataStoreStats.getConfigurationReadCount(), dataStoreStats.getConfigurationReadTotalTime(), - dataStoreStats.getConfigurationReadAverageTime()); - - LOG.info("BIDataStore Statistics: Operational Read Count: {} TotalTime: {} ms AverageTime (ns): {} ms", - dataStoreStats.getOperationalReadCount(), dataStoreStats.getOperationalReadTotalTime(), - dataStoreStats.getOperationalReadAverageTime()); - - LOG.info("BIDataStore Statistics: Request Commit Count: {} TotalTime: {} ms AverageTime (ns): {} ms", - dataStoreStats.getRequestCommitCount(), dataStoreStats.getRequestCommitTotalTime(), - dataStoreStats.getRequestCommitAverageTime()); + public org.opendaylight.mdsal.dom.broker.DOMRpcRouter getDelegateDomRouter() { + return delegateDomRouter; } - public RpcProviderRegistry getBindingRpcRegistry() { - return baBrokerImpl.getRoot(); - } + @Override + public void close() { - public RpcProvisionRegistry getDomRpcRegistry() { - if (biBrokerImpl == null) { - return null; - } - return biBrokerImpl.getRouter(); } - public RpcImplementation getDomRpcInvoker() { - return biBrokerImpl.getRouter(); + public MountPointService getBindingMountPointService() { + return this.baBrokerImpl.getMountService(); } - @Override - public void close() throws Exception { - + public DOMMountPointService getDomMountProviderService() { + return this.biMountImpl; } - public MountProviderService getBindingMountProviderService() { - return baBrokerImpl.getMountManager(); + public DataBroker getDataBroker() { + return this.dataBroker; } - public MountProvisionService getDomMountProviderService() { - return biMountImpl; + public void setSchemaModuleInfos(Set moduleInfos) { + this.schemaModuleInfos = moduleInfos; } - - }