import static com.google.common.base.Preconditions.checkState;
-import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry;
-
+import com.google.common.annotations.Beta;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
+import java.util.Set;
import org.opendaylight.mdsal.binding.api.DataBroker;
import org.opendaylight.mdsal.binding.api.MountPointService;
import org.opendaylight.mdsal.binding.api.NotificationPublishService;
import org.opendaylight.mdsal.binding.api.NotificationService;
+import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry;
+import org.opendaylight.mdsal.binding.api.RpcProviderService;
+import org.opendaylight.mdsal.binding.dom.adapter.AdapterContext;
import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMDataBrokerAdapter;
import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMMountPointServiceAdapter;
import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMNotificationPublishServiceAdapter;
import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMNotificationServiceAdapter;
import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMRpcProviderServiceAdapter;
import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMRpcServiceAdapter;
-import org.opendaylight.mdsal.binding.dom.adapter.BindingToNormalizedNodeCodec;
-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;
-import javassist.ClassPool;
-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.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.BindingAwareService;
-import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.controller.sal.binding.impl.RootBindingAwareBroker;
-import org.opendaylight.controller.sal.core.api.Broker.ProviderSession;
-import org.opendaylight.controller.sal.core.api.BrokerService;
-import org.opendaylight.controller.sal.core.spi.data.DOMStore;
-import org.opendaylight.controller.sal.dom.broker.BrokerImpl;
-import org.opendaylight.yangtools.binding.data.codec.gen.impl.DataObjectSerializerGenerator;
-import org.opendaylight.yangtools.binding.data.codec.gen.impl.StreamWriterGenerator;
-import org.opendaylight.yangtools.binding.data.codec.impl.BindingNormalizedNodeCodecRegistry;
-import org.opendaylight.yangtools.sal.binding.generator.impl.GeneratedClassLoadingStrategy;
-import org.opendaylight.yangtools.sal.binding.generator.impl.ModuleInfoBackedContext;
-import org.opendaylight.yangtools.sal.binding.generator.util.JavassistUtils;
+import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers;
+import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.mdsal.dom.api.DOMDataBroker;
+import org.opendaylight.mdsal.dom.api.DOMMountPointService;
+import org.opendaylight.mdsal.dom.api.DOMNotificationPublishService;
+import org.opendaylight.mdsal.dom.api.DOMNotificationService;
+import org.opendaylight.mdsal.dom.api.DOMRpcProviderService;
+import org.opendaylight.mdsal.dom.api.DOMRpcService;
+import org.opendaylight.mdsal.dom.broker.DOMMountPointServiceImpl;
+import org.opendaylight.mdsal.dom.broker.DOMNotificationRouter;
+import org.opendaylight.mdsal.dom.broker.DOMRpcRouter;
+import org.opendaylight.mdsal.dom.broker.SerializedDOMDataBroker;
+import org.opendaylight.mdsal.dom.spi.store.DOMStore;
+import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStore;
import org.opendaylight.yangtools.yang.binding.YangModuleInfo;
-import org.opendaylight.yangtools.yang.binding.util.BindingReflections;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
@Beta
public class BindingTestContext implements AutoCloseable {
-
-
- private BindingToNormalizedNodeCodec codec;
-
- private RootBindingAwareBroker baBrokerImpl;
-
- private BrokerImpl biBrokerImpl;
-
private final ListeningExecutorService executor;
- private final ClassPool classPool;
private final boolean startWithSchema;
private DOMNotificationService domListenService;
-
+ private Set<YangModuleInfo> schemaModuleInfos;
public DOMDataBroker getDomAsyncDataBroker() {
return newDOMDataBroker;
}
- public BindingToNormalizedNodeCodec getCodec() {
- return codec;
+ public AdapterContext getCodec() {
+ return mockSchemaService;
}
- 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 startNewDataBroker() {
checkState(executor != null, "Executor needs to be set");
checkState(newDOMDataBroker != null, "DOM Data Broker must be set");
- dataBroker = new BindingDOMDataBrokerAdapter(newDOMDataBroker, codec);
+ dataBroker = new BindingDOMDataBrokerAdapter(mockSchemaService, newDOMDataBroker);
}
public void startNewDomDataBroker() {
checkState(executor != null, "Executor needs to be set");
- final InMemoryDOMDataStore operStore = new InMemoryDOMDataStore("OPER", MoreExecutors.sameThreadExecutor());
- final InMemoryDOMDataStore configStore = new InMemoryDOMDataStore("CFG", MoreExecutors.sameThreadExecutor());
+ final InMemoryDOMDataStore operStore = new InMemoryDOMDataStore("OPER",
+ MoreExecutors.newDirectExecutorService());
+ final InMemoryDOMDataStore configStore = new InMemoryDOMDataStore("CFG",
+ MoreExecutors.newDirectExecutorService());
newDatastores = ImmutableMap.<LogicalDatastoreType, DOMStore>builder()
.put(LogicalDatastoreType.OPERATIONAL, operStore)
.put(LogicalDatastoreType.CONFIGURATION, configStore)
public void startBindingBroker() {
checkState(executor != null, "Executor needs to be set");
- baConsumerRpc = new BindingDOMRpcServiceAdapter(getDomRpcInvoker(), codec);
- baProviderRpc = new BindingDOMRpcProviderServiceAdapter(getDomRpcRegistry(), codec);
- final MountPointService mountService = new BindingDOMMountPointServiceAdapter(biMountImpl, codec);
-
- final ImmutableClassToInstanceMap<BindingAwareService> consumerServices =
- ImmutableClassToInstanceMap.<BindingAwareService>builder().build();
- final ImmutableClassToInstanceMap<BindingAwareService> providerServices =
- ImmutableClassToInstanceMap.<BindingAwareService>builder().build();;
- baBrokerImpl = new RootBindingAwareBroker("test", consumerServices, providerServices);
+ baConsumerRpc = new BindingDOMRpcServiceAdapter(mockSchemaService, getDomRpcInvoker());
+ baProviderRpc = new BindingDOMRpcProviderServiceAdapter(mockSchemaService, getDomRpcRegistry());
+ final MountPointService mountService = new BindingDOMMountPointServiceAdapter(mockSchemaService, biMountImpl);
}
public void startForwarding() {
}
- private ProviderSession createMockContext() {
-
- final ClassToInstanceMap<BrokerService> domBrokerServices = ImmutableClassToInstanceMap
- .<BrokerService> builder()
- //
- .put(DOMRpcRouter.class, biBrokerImpl.getRouter()) //
- .put(DOMMountPointService.class, biMountImpl)
- .build();
-
- return new ProviderSession() {
-
- @Override
- public <T extends BrokerService> T getService(final Class<T> service) {
- return domBrokerServices.getInstance(service);
- }
-
- @Override
- public boolean isClosed() {
- return false;
- }
-
- @Override
- public void close() {
- }
- };
- }
-
public void startBindingToDomMappingService() {
- checkState(classPool != null, "ClassPool needs to be present");
-
- final DataObjectSerializerGenerator generator = StreamWriterGenerator.create(JavassistUtils.forClassPool(classPool));
- final BindingNormalizedNodeCodecRegistry codecRegistry = new BindingNormalizedNodeCodecRegistry(generator);
- final GeneratedClassLoadingStrategy loading = GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy();
- codec = new BindingToNormalizedNodeCodec(loading, codecRegistry);
- mockSchemaService.registerSchemaContextListener(codec);
+ // No-op, really
}
- private void updateYangSchema(final ImmutableSet<YangModuleInfo> moduleInfos) {
- mockSchemaService.changeSchema(getContext(moduleInfos));
+ private void updateYangSchema(final Set<YangModuleInfo> moduleInfos) {
+ mockSchemaService.changeSchema(BindingRuntimeHelpers.createRuntimeContext(moduleInfos));
}
- private SchemaContext getContext(final ImmutableSet<YangModuleInfo> moduleInfos) {
- final ModuleInfoBackedContext ctx = ModuleInfoBackedContext.create();
- ctx.addModuleInfos(moduleInfos);
- return ctx.tryToCreateSchemaContext().get();
+ public EffectiveModelContext getContext() {
+ return mockSchemaService.getEffectiveModelContext();
}
public void start() {
startBindingBroker();
startForwarding();
- if (startWithSchema) {
+
+ if (schemaModuleInfos != null) {
+ updateYangSchema(schemaModuleInfos);
+ } else if (startWithSchema) {
loadYangSchemaFromClasspath();
}
}
private void startDomBroker() {
checkState(executor != null);
-
domRouter = new DOMRpcRouter();
mockSchemaService.registerSchemaContextListener(domRouter);
-
- final ClassToInstanceMap<BrokerService> services = MutableClassToInstanceMap.create();
- services.put(DOMRpcService.class, domRouter);
-
- biBrokerImpl = new BrokerImpl(domRouter,services);
-
}
public void startBindingNotificationBroker() {
final DOMNotificationRouter router = DOMNotificationRouter.create(16);
domPublishService = router;
domListenService = router;
- publishService = new BindingDOMNotificationPublishServiceAdapter(codec, domPublishService);
- listenService = new BindingDOMNotificationServiceAdapter(codec, domListenService);
+ publishService = new BindingDOMNotificationPublishServiceAdapter(mockSchemaService, domPublishService);
+ listenService = new BindingDOMNotificationServiceAdapter(mockSchemaService, domListenService);
}
updateYangSchema(moduleInfos);
}
+ public DOMRpcProviderService getDomRpcRegistry() {
+ return domRouter.getRpcProviderService();
+ }
-
- public RpcProviderRegistry getBindingRpcRegistry() {
- return baBrokerImpl.getRpcProviderRegistry();
+ public DOMRpcService getDomRpcInvoker() {
+ return domRouter.getRpcService();
}
- public DOMRpcProviderService getDomRpcRegistry() {
- return domRouter;
+ public RpcProviderService getBindingRpcProviderRegistry() {
+ return baProviderRpc;
}
- public DOMRpcService getDomRpcInvoker() {
- return domRouter;
+ public RpcConsumerRegistry getBindingRpcConsumerRegistry() {
+ return baConsumerRpc;
}
@Override
return dataBroker;
}
-
+ public void setSchemaModuleInfos(final Set<YangModuleInfo> moduleInfos) {
+ schemaModuleInfos = moduleInfos;
+ }
}
Code Review / mdsal.git / blobdiff