import static com.google.common.base.Preconditions.checkState;
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 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.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.compat.HydrogenDataBrokerAdapter;
-import org.opendaylight.controller.md.sal.binding.compat.HydrogenMountProvisionServiceAdapter;
+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.binding.impl.ForwardedBindingDataBroker;
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.compat.BackwardsCompatibleDataBroker;
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.NotificationBrokerImpl;
import org.opendaylight.controller.sal.binding.impl.RootBindingAwareBroker;
-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.spi.data.DOMStore;
-import org.opendaylight.controller.sal.dom.broker.BrokerImpl;
-import org.opendaylight.controller.sal.dom.broker.impl.SchemaAwareRpcBroker;
-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.concepts.ListenerRegistration;
-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.impl.RuntimeGeneratedMappingServiceImpl;
-import org.opendaylight.yangtools.sal.binding.generator.util.JavassistUtils;
+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;
@Beta
+@Deprecated
public class BindingTestContext implements AutoCloseable {
-
-
- private RuntimeGeneratedMappingServiceImpl mappingServiceImpl;
private BindingToNormalizedNodeCodec codec;
private RootBindingAwareBroker baBrokerImpl;
- private NotificationBrokerImpl baNotifyImpl;
-
+ private HeliumNotificationProviderServiceAdapter baNotifyImpl;
- @Deprecated
- 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 ImmutableMap<LogicalDatastoreType, DOMStore> newDatastores;
- @Deprecated
- private BackwardsCompatibleDataBroker biCompatibleBroker;
-
- @Deprecated
- private DataProviderService baData;
-
private DOMDataBroker newDOMDataBroker;
private final MockSchemaService mockSchemaService = new MockSchemaService();
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<YangModuleInfo> schemaModuleInfos;
public DOMDataBroker getDomAsyncDataBroker() {
- return newDOMDataBroker;
+ return this.newDOMDataBroker;
}
public BindingToNormalizedNodeCodec getCodec() {
- return codec;
+ 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 startNewDataBroker() {
- checkState(executor != null, "Executor needs to be set");
- checkState(newDOMDataBroker != null, "DOM Data Broker must be set");
- dataBroker = new ForwardedBindingDataBroker(newDOMDataBroker, codec);
+ 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");
- final InMemoryDOMDataStore operStore = new InMemoryDOMDataStore("OPER", MoreExecutors.sameThreadExecutor());
- final InMemoryDOMDataStore configStore = new InMemoryDOMDataStore("CFG", MoreExecutors.sameThreadExecutor());
- newDatastores = ImmutableMap.<LogicalDatastoreType, DOMStore>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.<LogicalDatastoreType, DOMStore>builder()
.put(LogicalDatastoreType.OPERATIONAL, operStore)
.put(LogicalDatastoreType.CONFIGURATION, configStore)
.build();
- newDOMDataBroker = new SerializedDOMDataBroker(newDatastores, executor);
+ this.newDOMDataBroker = new SerializedDOMDataBroker(this.newDatastores, this.executor);
- biCompatibleBroker = new BackwardsCompatibleDataBroker(newDOMDataBroker,mockSchemaService);
-
- mockSchemaService.registerSchemaContextListener(configStore);
- mockSchemaService.registerSchemaContextListener(operStore);
- biDataLegacyBroker = biCompatibleBroker;
+ this.mockSchemaService.registerSchemaContextListener(configStore);
+ this.mockSchemaService.registerSchemaContextListener(operStore);
}
public void startBindingDataBroker() {
}
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");
-
- baConsumerRpc = new BindingDOMRpcServiceAdapter(getDomRpcInvoker(), codec);
- baProviderRpc = new BindingDOMRpcProviderServiceAdapter(getDomRpcRegistry(), codec);
-
- baBrokerImpl = new RootBindingAwareBroker("test");
-
- final MountPointService mountService = new BindingDOMMountPointServiceAdapter(biMountImpl, codec);
- baBrokerImpl.setMountService(mountService);
- baBrokerImpl.setLegacyMountManager(new HydrogenMountProvisionServiceAdapter(mountService));
- baBrokerImpl.setRpcBroker(new HeliumRpcProviderRegistry(baConsumerRpc,baProviderRpc));
- 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() {
+ this.baConsumerRpc = new BindingDOMRpcServiceAdapter(getDomRpcInvoker(), this.codec);
+ this.baProviderRpc = new BindingDOMRpcProviderServiceAdapter(getDomRpcRegistry(), this.codec);
- }
+ this.baBrokerImpl = new RootBindingAwareBroker("test");
- private ProviderSession createMockContext() {
+ 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();
+ }
- @SuppressWarnings("deprecation")
- final ClassToInstanceMap<BrokerService> domBrokerServices = ImmutableClassToInstanceMap
- .<BrokerService> builder()
- //
- .put(org.opendaylight.controller.sal.core.api.data.DataProviderService.class, biDataLegacyBroker) //
- .put(RpcProvisionRegistry.class, biBrokerImpl.getRouter()) //
- .put(DOMMountPointService.class, biMountImpl)
- .build();
+ public void startForwarding() {
- return new ProviderSession() {
-
- @Override
- public Future<RpcResult<CompositeNode>> rpc(final QName rpc, final CompositeNode input) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public <T extends BrokerService> T getService(final Class<T> service) {
- return domBrokerServices.getInstance(service);
- }
-
- @Override
- public boolean isClosed() {
- return false;
- }
-
- @Override
- public Set<QName> getSupportedRpcs() {
- return null;
- }
-
- @Override
- public void close() {
- }
-
- @Override
- public ListenerRegistration<RpcRegistrationListener> 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 DataObjectSerializerGenerator generator = StreamWriterGenerator.create(JavassistUtils.forClassPool(classPool));
- final BindingNormalizedNodeCodecRegistry codecRegistry = new BindingNormalizedNodeCodecRegistry(generator);
+ final BindingNormalizedNodeCodecRegistry codecRegistry = new BindingNormalizedNodeCodecRegistry();
final GeneratedClassLoadingStrategy loading = GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy();
- codec = new BindingToNormalizedNodeCodec(loading, mappingServiceImpl, codecRegistry);
- mockSchemaService.registerSchemaContextListener(codec);
+ this.codec = new BindingToNormalizedNodeCodec(loading, codecRegistry);
+ this.mockSchemaService.registerSchemaContextListener(this.codec);
}
- private void updateYangSchema(final ImmutableSet<YangModuleInfo> moduleInfos) {
- mockSchemaService.changeSchema(getContext(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();
startDomMountPoint();
startBindingToDomMappingService();
startNewDataBroker();
- startNewBindingDataBroker();
startBindingNotificationBroker();
startBindingBroker();
startForwarding();
- if (startWithSchema) {
+
+ if (schemaModuleInfos != null) {
+ updateYangSchema(schemaModuleInfos);
+ } else if (this.startWithSchema) {
loadYangSchemaFromClasspath();
}
}
- public void startNewBindingDataBroker() {
- final HydrogenDataBrokerAdapter forwarded = new HydrogenDataBrokerAdapter(dataBroker);
- baData = forwarded;
- }
-
private void startDomMountPoint() {
- biMountImpl = new DOMMountPointServiceImpl();
+ this.biMountImpl = new DOMMountPointServiceImpl();
}
private void startDomBroker() {
- checkState(executor != null);
-
- final SchemaAwareRpcBroker router = new SchemaAwareRpcBroker("/", mockSchemaService);
-
- domRouter = new DOMRpcRouter();
- mockSchemaService.registerSchemaContextListener(domRouter);
-
- final ClassToInstanceMap<BrokerService> services = MutableClassToInstanceMap.create();
- services.put(DOMRpcService.class, domRouter);
-
- 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() {
- final ImmutableSet<YangModuleInfo> moduleInfos = BindingReflections.loadModuleInfos();
- updateYangSchema(moduleInfos);
- }
-
- @Deprecated
- public DataProviderService getBindingDataBroker() {
- return baData;
- }
-
- @Deprecated
- public org.opendaylight.controller.sal.core.api.data.DataProviderService getDomDataBroker() {
- return biDataLegacyBroker;
- }
-
- public BindingIndependentMappingService getBindingToDomMappingService() {
- return mappingServiceImpl;
+ updateYangSchema(BindingReflections.loadModuleInfos());
}
public RpcProviderRegistry getBindingRpcRegistry() {
- return baBrokerImpl.getRoot();
+ return this.baBrokerImpl.getRoot();
}
public DOMRpcProviderService getDomRpcRegistry() {
- return domRouter;
+ return this.domRouter;
}
public DOMRpcService getDomRpcInvoker() {
- return domRouter;
+ return this.domRouter;
+ }
+
+ public org.opendaylight.mdsal.dom.broker.DOMRpcRouter getDelegateDomRouter() {
+ return delegateDomRouter;
}
@Override
- public void close() throws Exception {
+ public void close() {
}
- public MountProviderService getBindingMountProviderService() {
- return baBrokerImpl.getLegacyMount();
+ public MountPointService getBindingMountPointService() {
+ return this.baBrokerImpl.getMountService();
}
public DOMMountPointService getDomMountProviderService() {
- return biMountImpl;
+ return this.biMountImpl;
}
public DataBroker getDataBroker() {
- return dataBroker;
+ return this.dataBroker;
}
-
+ public void setSchemaModuleInfos(Set<YangModuleInfo> moduleInfos) {
+ this.schemaModuleInfos = moduleInfos;
+ }
}
Code Review / controller.git / blobdiff