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 javassist.ClassPool;
+import java.util.Set;
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.sal.binding.api.RpcProviderRegistry;
import org.opendaylight.controller.sal.binding.impl.RootBindingAwareBroker;
import org.opendaylight.controller.sal.core.spi.data.DOMStore;
-import org.opendaylight.mdsal.binding.dom.codec.gen.impl.DataObjectSerializerGenerator;
-import org.opendaylight.mdsal.binding.dom.codec.gen.impl.StreamWriterGenerator;
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.generator.util.JavassistUtils;
+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.model.api.SchemaContext;
@Beta
private final ListeningExecutorService executor;
- private final ClassPool classPool;
private final boolean startWithSchema;
private BindingDOMRpcProviderServiceAdapter baProviderRpc;
private DOMRpcRouter domRouter;
+ private org.opendaylight.mdsal.dom.broker.DOMRpcRouter delegateDomRouter;
private NotificationPublishService publishService;
private DOMNotificationService domListenService;
-
+ private Set<YangModuleInfo> schemaModuleInfos;
public DOMDataBroker getDomAsyncDataBroker() {
return this.newDOMDataBroker;
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 startBindingToDomMappingService() {
- checkState(this.classPool != null, "ClassPool needs to be present");
-
- final DataObjectSerializerGenerator generator = StreamWriterGenerator.create(
- JavassistUtils.forClassPool(this.classPool));
- final BindingNormalizedNodeCodecRegistry codecRegistry = new BindingNormalizedNodeCodecRegistry(generator);
+ 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<YangModuleInfo> moduleInfos) {
+ private void updateYangSchema(final Set<YangModuleInfo> moduleInfos) {
this.mockSchemaService.changeSchema(getContext(moduleInfos));
}
- private SchemaContext getContext(final ImmutableSet<YangModuleInfo> moduleInfos) {
+ private static SchemaContext getContext(final Set<YangModuleInfo> moduleInfos) {
final ModuleInfoBackedContext ctx = ModuleInfoBackedContext.create();
ctx.addModuleInfos(moduleInfos);
return ctx.tryToCreateSchemaContext().get();
startBindingBroker();
startForwarding();
- if (this.startWithSchema) {
+
+ if (schemaModuleInfos != null) {
+ updateYangSchema(schemaModuleInfos);
+ } else if (this.startWithSchema) {
loadYangSchemaFromClasspath();
}
}
private void startDomBroker() {
checkState(this.executor != null);
- org.opendaylight.mdsal.dom.broker.DOMRpcRouter delegate =
- org.opendaylight.mdsal.dom.broker.DOMRpcRouter.newInstance(mockSchemaService);
- this.domRouter = new DOMRpcRouter(delegate, delegate);
+ delegateDomRouter = org.opendaylight.mdsal.dom.broker.DOMRpcRouter.newInstance(mockSchemaService);
+ this.domRouter = new DOMRpcRouter(delegateDomRouter.getRpcService(), delegateDomRouter.getRpcProviderService());
}
public void startBindingNotificationBroker() {
}
public void loadYangSchemaFromClasspath() {
- final ImmutableSet<YangModuleInfo> moduleInfos = BindingReflections.loadModuleInfos();
- updateYangSchema(moduleInfos);
+ updateYangSchema(BindingReflections.loadModuleInfos());
}
public RpcProviderRegistry getBindingRpcRegistry() {
return this.domRouter;
}
+ public org.opendaylight.mdsal.dom.broker.DOMRpcRouter getDelegateDomRouter() {
+ return delegateDomRouter;
+ }
+
@Override
- public void close() throws Exception {
+ public void close() {
}
public DataBroker getDataBroker() {
return this.dataBroker;
}
+
+ public void setSchemaModuleInfos(Set<YangModuleInfo> moduleInfos) {
+ this.schemaModuleInfos = moduleInfos;
+ }
}