X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Fhoneynode%2F1.2.1%2Fminimal-distribution-core%2Fsrc%2Fmain%2Fjava%2Fio%2Ffd%2Fhoneycomb%2Finfra%2Fdistro%2Fdata%2FConfigAndOperationalPipelineModule.java;fp=tests%2Fhoneynode%2F2.1%2Fminimal-distribution-core%2Fsrc%2Fmain%2Fjava%2Fio%2Ffd%2Fhoneycomb%2Finfra%2Fdistro%2Fdata%2FConfigAndOperationalPipelineModule.java;h=a98b22013ccecfe998396ad7096af09baf3350cc;hb=c764b14f67faf1665f8814db9e5d16ddb342553e;hp=962f59387cc352c2d3096a4adccbc0aae951ec45;hpb=b90fdacec82f92e07d14ed1df31e3fe53275c676;p=transportpce.git

diff --git a/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ConfigAndOperationalPipelineModule.java b/tests/honeynode/1.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ConfigAndOperationalPipelineModule.java
similarity index 87%
rename from tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ConfigAndOperationalPipelineModule.java
rename to tests/honeynode/1.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ConfigAndOperationalPipelineModule.java
index 962f59387..a98b22013 100644
--- a/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ConfigAndOperationalPipelineModule.java
+++ b/tests/honeynode/1.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ConfigAndOperationalPipelineModule.java
@@ -19,13 +19,11 @@ package io.fd.honeycomb.infra.distro.data;
 import com.google.inject.PrivateModule;
 import com.google.inject.Singleton;
 import com.google.inject.name.Names;
-
 import io.fd.honeycomb.data.ModifiableDataManager;
 import io.fd.honeycomb.data.ReadableDataManager;
 import io.fd.honeycomb.data.init.DataTreeInitializer;
 import io.fd.honeycomb.data.init.ShutdownHandler;
 import io.fd.honeycomb.impl.EmptyDomMountService;
-import io.fd.honeycomb.impl.ShutdownHandlerImpl;
 import io.fd.honeycomb.infra.distro.data.config.WriterRegistryProvider;
 import io.fd.honeycomb.infra.distro.data.oper.ReadableDTDelegProvider;
 import io.fd.honeycomb.infra.distro.data.oper.ReaderRegistryProvider;
@@ -33,13 +31,11 @@ import io.fd.honeycomb.rpc.RpcRegistry;
 import io.fd.honeycomb.rpc.RpcRegistryBuilder;
 import io.fd.honeycomb.translate.read.registry.ReaderRegistry;
 import io.fd.honeycomb.translate.write.registry.WriterRegistry;
-
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-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.DOMRpcService;
-import org.opendaylight.controller.md.sal.dom.broker.impl.DOMNotificationRouter;
-import org.opendaylight.controller.sal.core.api.Broker;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.dom.api.DOMDataBroker;
+import org.opendaylight.mdsal.dom.api.DOMMountPointService;
+import org.opendaylight.mdsal.dom.api.DOMRpcService;
+import org.opendaylight.mdsal.dom.broker.DOMNotificationRouter;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree;
 
 public class ConfigAndOperationalPipelineModule extends PrivateModule {
@@ -49,7 +45,7 @@ public class ConfigAndOperationalPipelineModule extends PrivateModule {
 
     @Override
     protected void configure() {
-        bind(ShutdownHandler.class).to(ShutdownHandlerImpl.class).in(Singleton.class);
+        bind(ShutdownHandler.class).toProvider(ShutdownHandlerProvider.class).in(Singleton.class);
         expose(ShutdownHandler.class);
 
         // Mount point service is required by notification service and restconf
@@ -101,9 +97,6 @@ public class ConfigAndOperationalPipelineModule extends PrivateModule {
         // Create notification service
         bind(DOMNotificationRouter.class).toProvider(DOMNotificationServiceProvider.class).in(Singleton.class);
         expose(DOMNotificationRouter.class);
-        // Wrap notification service, data broker and schema service in a Broker MD-SAL API
-        bind(Broker.class).toProvider(HoneycombDOMBrokerProvider.class).in(Singleton.class);
-        expose(Broker.class);
     }
 
     private void configureRpcs() {