import org.opendaylight.controller.sal.binding.api.NotificationService;
import org.opendaylight.controller.sal.binding.api.RpcConsumerRegistry;
import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.controller.sal.binding.api.mount.MountProviderService;
-import org.opendaylight.controller.sal.binding.api.mount.MountService;
import org.opendaylight.controller.sal.binding.api.rpc.RpcContextIdentifier;
import org.opendaylight.yangtools.concepts.Identifiable;
import org.opendaylight.yangtools.concepts.ListenerRegistration;
private DataBroker dataBroker;
- private MountProviderService legacyMount;
-
private ImmutableClassToInstanceMap<BindingAwareService> supportedConsumerServices;
private ImmutableClassToInstanceMap<BindingAwareService> supportedProviderServices;
private MountPointService mountService;
- public void setLegacyMountManager(final MountProviderService legacyMount) {
- this.legacyMount = legacyMount;
- }
-
public RootBindingAwareBroker(final String instanceName) {
this.identifier = instanceName;
}
return mountService;
}
- public MountProviderService getLegacyMount() {
- return legacyMount;
- }
-
public void setDataBroker(final DataBroker asyncDataBroker) {
dataBroker = asyncDataBroker;
}
consBuilder.put(DataBroker.class, dataBroker);
}
consBuilder.put(MountPointService.class, mountService);
- consBuilder.put(MountService.class, legacyMount).build();
supportedConsumerServices = consBuilder.build();
final ImmutableClassToInstanceMap.Builder<BindingAwareService> provBuilder = ImmutableClassToInstanceMap
.builder();
provBuilder.putAll(supportedConsumerServices).put(NotificationProviderService.class, getRoot())
- .put(RpcProviderRegistry.class, getRoot()) .put(MountProviderService.class, legacyMount);
+ .put(RpcProviderRegistry.class, getRoot());
if (notificationPublishService != null) {
provBuilder.put(NotificationPublishService.class, notificationPublishService);
}
- supportedConsumerServices = consBuilder.build();
+
supportedProviderServices = provBuilder.build();
}
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.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.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.mount.MountProviderService;
import org.opendaylight.controller.sal.binding.impl.RootBindingAwareBroker;
import org.opendaylight.controller.sal.core.api.BrokerService;
import org.opendaylight.controller.sal.core.spi.data.DOMStore;
final MountPointService mountService = new BindingDOMMountPointServiceAdapter(this.biMountImpl, this.codec);
this.baBrokerImpl.setMountService(mountService);
- this.baBrokerImpl.setLegacyMountManager(new HydrogenMountProvisionServiceAdapter(mountService));
this.baBrokerImpl.setRpcBroker(new HeliumRpcProviderRegistry(this.baConsumerRpc, this.baProviderRpc));
this.baBrokerImpl.setNotificationBroker(this.baNotifyImpl);
this.baBrokerImpl.start();
}
- public MountProviderService getBindingMountProviderService() {
- return this.baBrokerImpl.getLegacyMount();
- }
-
public MountPointService getBindingMountPointService() {
return this.baBrokerImpl.getMountService();
}
import org.opendaylight.controller.md.sal.binding.api.MountPointService;
import org.opendaylight.controller.md.sal.binding.compat.HeliumRpcProviderRegistry;
-import org.opendaylight.controller.md.sal.binding.compat.HydrogenMountProvisionServiceAdapter;
import org.opendaylight.controller.md.sal.binding.impl.BindingDOMMountPointServiceAdapter;
import org.opendaylight.controller.md.sal.binding.impl.BindingDOMRpcProviderServiceAdapter;
import org.opendaylight.controller.md.sal.binding.impl.BindingDOMRpcServiceAdapter;
import org.opendaylight.controller.md.sal.dom.api.DOMRpcProviderService;
import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;
import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.controller.sal.binding.api.mount.MountProviderService;
import org.opendaylight.controller.sal.binding.impl.RootBindingAwareBroker;
import org.opendaylight.controller.sal.core.api.Broker;
import org.opendaylight.controller.sal.core.api.Broker.ProviderSession;
final BindingDOMRpcProviderServiceAdapter rpcProvider = createRpcProvider(codec,session);
final RootBindingAwareBroker broker = new RootBindingAwareBroker(getIdentifier().getInstanceName());
final RpcProviderRegistry heliumRpcBroker = new HeliumRpcProviderRegistry(rpcConsumer, rpcProvider);
- final MountProviderService legacyMount = createLegacyMountPointService(mount);
-
broker.setNotificationBroker(getNotificationServiceDependency());
if (getNotificationPublishServiceDependency() != null) {
broker.setRpcBroker(heliumRpcBroker);
broker.setDataBroker(getRootDataBrokerDependency());
broker.setMountService(mount);
- broker.setLegacyMountManager(legacyMount);
broker.start();
return broker;
}
-
- @SuppressWarnings("deprecation")
- private MountProviderService createLegacyMountPointService(final MountPointService service) {
- if(service != null) {
- return new HydrogenMountProvisionServiceAdapter(service);
- }
- return null;
- }
-
private BindingDOMRpcProviderServiceAdapter createRpcProvider(final BindingToNormalizedNodeCodec codec,
final ProviderSession session) {
final DOMRpcProviderService domService = session.getService(DOMRpcProviderService.class);
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import com.google.common.base.Optional;
import com.google.common.util.concurrent.CheckedFuture;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.MoreExecutors;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.opendaylight.controller.md.sal.binding.api.MountPoint;
+import org.opendaylight.controller.md.sal.binding.api.MountPointService;
import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
import org.opendaylight.controller.md.sal.dom.api.DOMRpcAvailabilityListener;
import org.opendaylight.controller.md.sal.dom.api.DOMRpcException;
import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult;
import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;
import org.opendaylight.controller.md.sal.dom.spi.DefaultDOMRpcResult;
-import org.opendaylight.controller.sal.binding.api.mount.MountProviderInstance;
-import org.opendaylight.controller.sal.binding.api.mount.MountProviderService;
+import org.opendaylight.controller.sal.binding.api.RpcConsumerRegistry;
import org.opendaylight.controller.sal.binding.test.util.BindingBrokerTestFactory;
import org.opendaylight.controller.sal.binding.test.util.BindingTestContext;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.bi.ba.rpcservice.rev140701.OpendaylightTestRpcServiceService;
private BindingTestContext testContext;
private DOMMountPointService domMountPointService;
- private MountProviderService bindingMountPointService;
+ private MountPointService bindingMountPointService;
private SchemaContext schemaContext;
/**
testContext.start();
domMountPointService = testContext.getDomMountProviderService();
- bindingMountPointService = testContext.getBindingMountProviderService();
+ bindingMountPointService = testContext.getBindingMountPointService();
assertNotNull(domMountPointService);
final InputStream moduleStream = BindingReflections.getModuleInfo(
return Futures.immediateCheckedFuture(result);
}
}).register();
- final MountProviderInstance mountInstance = bindingMountPointService
- .getMountPoint(BA_MOUNT_ID);
- assertNotNull(mountInstance);
- final OpendaylightTestRpcServiceService rpcService = mountInstance
+
+ final Optional<MountPoint> mountInstance = bindingMountPointService.getMountPoint(BA_MOUNT_ID);
+ assertTrue(mountInstance.isPresent());
+
+ final Optional<RpcConsumerRegistry> rpcRegistry = mountInstance.get().getService(RpcConsumerRegistry.class);
+ assertTrue(rpcRegistry.isPresent());
+ final OpendaylightTestRpcServiceService rpcService = rpcRegistry.get()
.getRpcService(OpendaylightTestRpcServiceService.class);
assertNotNull(rpcService);