- controllerRoot = new RootSalInstance(getRpcProviderRegistry(), getNotificationBroker(), getDataBroker());
-
+ controllerRoot = new RootSalInstance(getRpcProviderRegistry(), getNotificationBroker());
+
+ final ImmutableClassToInstanceMap.Builder<BindingAwareService> consBuilder = ImmutableClassToInstanceMap
+ .builder();
+
+ consBuilder.put(NotificationService.class, getRoot());
+ consBuilder.put(RpcConsumerRegistry.class, getRoot());
+ if (dataBroker != null) {
+ consBuilder.put(DataBroker.class, dataBroker);
+ }
+ consBuilder.put(MountPointService.class, mountService);
+
+ supportedConsumerServices = consBuilder.build();
+ final ImmutableClassToInstanceMap.Builder<BindingAwareService> provBuilder = ImmutableClassToInstanceMap
+ .builder();
+ provBuilder.putAll(supportedConsumerServices).put(NotificationProviderService.class, getRoot())
+ .put(RpcProviderRegistry.class, getRoot());
+ if (notificationPublishService != null) {
+ provBuilder.put(NotificationPublishService.class, notificationPublishService);
+ }