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=1ea56381ef1cf9a4b248d2be2795d6c290f81c0d;hp=c03d851f5c9ef740a14a9097feceaf8909833184;hb=1f6daaf007e78df276604baa4c515a50037a649d;hpb=1dd1433d1e2f30855b098cca7cc48039a9747df8 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 c03d851f5c..1ea56381ef 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 @@ -1,5 +1,14 @@ +/* + * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * 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.sal.binding.test.util; +import static com.google.common.base.Preconditions.checkState; + import java.io.InputStream; import java.util.ArrayList; import java.util.List; @@ -8,20 +17,21 @@ import java.util.concurrent.Future; import javassist.ClassPool; -import org.eclipse.xtext.xbase.lib.Pure; +import org.opendaylight.controller.md.sal.binding.impl.ForwardedBackwardsCompatibleDataBroker; +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.store.impl.InMemoryDOMDataStore; 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.dom.serializer.impl.RuntimeGeneratedMappingServiceImpl; import org.opendaylight.controller.sal.binding.impl.DataBrokerImpl; import org.opendaylight.controller.sal.binding.impl.NotificationBrokerImpl; -import org.opendaylight.controller.sal.binding.impl.RootBindingAwareBroker; 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.connect.dom.BindingIndependentMappingService; import org.opendaylight.controller.sal.binding.impl.forward.DomForwardedBindingBrokerImpl; -import org.opendaylight.controller.sal.binding.test.AbstractDataServiceTest; 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; @@ -31,17 +41,19 @@ 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.core.api.notify.NotificationPublishService; +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.RpcRouterImpl; 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.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl; @@ -53,10 +65,9 @@ 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.collect.MutableClassToInstanceMap; import com.google.common.util.concurrent.ListeningExecutorService; -import com.google.common.util.concurrent.MoreExecutors; - -import static com.google.common.base.Preconditions.*; public class BindingTestContext implements AutoCloseable { @@ -73,13 +84,14 @@ public class BindingTestContext implements AutoCloseable { private BindingIndependentConnector baConnectImpl; 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 boolean dataStoreStatisticsEnabled = false; + private final boolean dataStoreStatisticsEnabled = false; private final ListeningExecutorService executor; private final ClassPool classPool; @@ -88,12 +100,31 @@ public class BindingTestContext implements AutoCloseable { private MountPointManagerImpl biMountImpl; - protected BindingTestContext(ListeningExecutorService executor, ClassPool classPool, boolean startWithSchema) { + + + private ImmutableMap newDatastores; + + private BackwardsCompatibleDataBroker biCompatibleBroker; + + private DataProviderService baData; + + private DOMDataBroker newDOMDataBroker; + + private final MockSchemaService mockSchemaService = new MockSchemaService(); + + + + public DOMDataBroker getDomAsyncDataBroker() { + return newDOMDataBroker; + } + + protected BindingTestContext(final ListeningExecutorService executor, final ClassPool classPool, 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"); @@ -106,7 +137,7 @@ public class BindingTestContext implements AutoCloseable { } else { dataStore = schemaAwareDataStore; } - + mockSchemaService.registerSchemaServiceListener(schemaAwareDataStore); biDataImpl.registerConfigurationReader(TREE_ROOT, dataStore); biDataImpl.registerOperationalReader(TREE_ROOT, dataStore); biDataImpl.registerCommitHandler(TREE_ROOT, dataStore); @@ -116,31 +147,51 @@ public class BindingTestContext implements AutoCloseable { checkState(executor != null, "Executor needs to be set"); biDataImpl = new org.opendaylight.controller.sal.dom.broker.DataBrokerImpl(); biDataImpl.setExecutor(executor); + biDataLegacyBroker = biDataImpl; + } + + 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() + .put(LogicalDatastoreType.OPERATIONAL, operStore) + .put(LogicalDatastoreType.CONFIGURATION, configStore) + .build(); + + newDOMDataBroker = new DOMDataBrokerImpl(newDatastores, executor); + + biCompatibleBroker = new BackwardsCompatibleDataBroker(newDOMDataBroker,mockSchemaService); + + mockSchemaService.registerSchemaServiceListener(configStore); + mockSchemaService.registerSchemaServiceListener(operStore); + biDataLegacyBroker = biCompatibleBroker; } 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(baDataImpl != null, "Binding Data Broker must be started"); + 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.setDataBroker(baDataImpl); + baBrokerImpl.setLegacyDataBroker(baData); baBrokerImpl.setNotificationBroker(baNotifyImpl); baBrokerImpl.start(); } public void startForwarding() { - checkState(baDataImpl != null, "Binding Data Broker needs to be started"); - checkState(biDataImpl != null, "DOM Data Broker needs to be started."); + 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()); @@ -151,11 +202,11 @@ public class BindingTestContext implements AutoCloseable { } private ProviderSession createMockContext() { - // TODO Auto-generated method stub + final ClassToInstanceMap domBrokerServices = ImmutableClassToInstanceMap . builder() // - .put(org.opendaylight.controller.sal.core.api.data.DataProviderService.class, biDataImpl) // + .put(org.opendaylight.controller.sal.core.api.data.DataProviderService.class, biDataLegacyBroker) // .put(RpcProvisionRegistry.class, biBrokerImpl.getRouter()) // .put(MountProvisionService.class, biMountImpl) // .build(); @@ -163,12 +214,12 @@ public class BindingTestContext implements AutoCloseable { return new ProviderSession() { @Override - public Future> rpc(QName rpc, CompositeNode input) { + public Future> rpc(final QName rpc, final CompositeNode input) { throw new UnsupportedOperationException(); } @Override - public T getService(Class service) { + public T getService(final Class service) { return domBrokerServices.getInstance(service); } @@ -188,23 +239,23 @@ public class BindingTestContext implements AutoCloseable { @Override public ListenerRegistration addRpcRegistrationListener( - RpcRegistrationListener listener) { + final RpcRegistrationListener listener) { return null; } @Override - public RpcRegistration addRpcImplementation(QName rpcType, RpcImplementation implementation) + public RpcRegistration addRpcImplementation(final QName rpcType, final RpcImplementation implementation) throws IllegalArgumentException { return null; } @Override - public RoutedRpcRegistration addRoutedRpcImplementation(QName rpcType, RpcImplementation implementation) { + public RoutedRpcRegistration addRoutedRpcImplementation(final QName rpcType, final RpcImplementation implementation) { return null; } @Override - public RoutedRpcRegistration addMountedRpcImplementation(QName rpcType, RpcImplementation implementation) { + public RoutedRpcRegistration addMountedRpcImplementation(final QName rpcType, final RpcImplementation implementation) { return null; } }; @@ -212,34 +263,27 @@ public class BindingTestContext implements AutoCloseable { public void startBindingToDomMappingService() { checkState(classPool != null, "ClassPool needs to be present"); - mappingServiceImpl = new RuntimeGeneratedMappingServiceImpl(); - mappingServiceImpl.setPool(classPool); - mappingServiceImpl.start(null); + mappingServiceImpl = new RuntimeGeneratedMappingServiceImpl(classPool); + mockSchemaService.registerSchemaServiceListener(mappingServiceImpl); } - public void updateYangSchema(String[] files) { - SchemaContext context = getContext(files); - if (schemaAwareDataStore != null) { - schemaAwareDataStore.onGlobalContextUpdated(context); - } - if (mappingServiceImpl != null) { - mappingServiceImpl.onGlobalContextUpdated(context); - } + public void updateYangSchema(final String[] files) { + mockSchemaService.changeSchema(getContext(files)); } public static String[] getAllYangFilesOnClasspath() { Predicate predicate = new Predicate() { @Override - public boolean apply(String input) { + 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 (String[]) result.toArray(new String[result.size()]); + return result.toArray(new String[result.size()]); } - private static SchemaContext getContext(String[] yangFiles) { + private static SchemaContext getContext(final String[] yangFiles) { ClassLoader loader = BindingTestContext.class.getClassLoader(); List streams = new ArrayList<>(); for (String string : yangFiles) { @@ -251,7 +295,7 @@ public class BindingTestContext implements AutoCloseable { return parser.resolveSchemaContext(modules); } - public void start() { + public void startLegacy() { startBindingDataBroker(); startBindingNotificationBroker(); startBindingBroker(); @@ -266,6 +310,27 @@ public class BindingTestContext implements AutoCloseable { } } + public void start() { + startNewDomDataBroker(); + startDomBroker(); + startDomMountPoint(); + startBindingToDomMappingService(); + startNewBindingDataBroker(); + + startBindingNotificationBroker(); + startBindingBroker(); + + startForwarding(); + if (startWithSchema) { + loadYangSchemaFromClasspath(); + } + } + + public void startNewBindingDataBroker() { + ForwardedBackwardsCompatibleDataBroker forwarded = new ForwardedBackwardsCompatibleDataBroker(newDOMDataBroker, mappingServiceImpl,mockSchemaService, executor); + baData = forwarded; + } + private void startDomMountPoint() { biMountImpl = new MountPointManagerImpl(); biMountImpl.setDataBroker(getDomDataBroker()); @@ -273,9 +338,11 @@ public class BindingTestContext implements AutoCloseable { private void startDomBroker() { checkState(executor != null); - biBrokerImpl = new BrokerImpl(); - biBrokerImpl.setExecutor(executor); - biBrokerImpl.setRouter(new RpcRouterImpl("test")); + + SchemaAwareRpcBroker router = new SchemaAwareRpcBroker("/", mockSchemaService); + ClassToInstanceMap services = MutableClassToInstanceMap.create(); + biBrokerImpl = new BrokerImpl(router,services); + } public void startBindingNotificationBroker() { @@ -290,11 +357,11 @@ public class BindingTestContext implements AutoCloseable { } public DataProviderService getBindingDataBroker() { - return baDataImpl; + return baData; } public org.opendaylight.controller.sal.core.api.data.DataProviderService getDomDataBroker() { - return biDataImpl; + return biDataLegacyBroker; } public DataStore getDomDataStore() { @@ -350,4 +417,6 @@ public class BindingTestContext implements AutoCloseable { public MountProvisionService getDomMountProviderService() { return biMountImpl; } + + }