un-comment ConfigurationServiceFactoryImpl

requires https://git.opendaylight.org/gerrit/#/c/76588/ for
https://jira.opendaylight.org/browse/OPNFLWPLUG-1037

Signed-off-by: Michael Vorburger <mike@vorburger.ch>

diff --git a/TODO.md b/TODO.md
index 4a055a2e72a26f0612f3796b51504e7e0762de21..be3c8dbea87eb558e2faffc23e8d3327128b3d0c 100644 (file)
--- a/TODO.md
+++ b/TODO.md
@@ -19,7 +19,8 @@
 
 - [ ] RestConfWiring with Web API
 
-- [ ] OpenFlowPlugin wiring
+- [X] OpenFlowPlugin wiring ConfigurationServiceFactoryImpl (OPNFLWPLUG-1037)
+- [ ] OpenFlowPluginWiring PacketProcessingService <odl:action-provider>
 
 - [ ] skitt's https://github.com/vorburger/opendaylight-simple/issues/38
 - [ ] DiagStatusWiring auto-discover ServiceStatusProvider

diff --git a/src/main/java/org/opendaylight/openflowplugin/simple/OpenFlowPluginWiring.java b/src/main/java/org/opendaylight/openflowplugin/simple/OpenFlowPluginWiring.java
index 20a08b65225bd71bc98433212983a5bcb835b463..916e9a73ce34e5b1728548dae2737def021097b2 100644 (file)
--- a/src/main/java/org/opendaylight/openflowplugin/simple/OpenFlowPluginWiring.java
+++ b/src/main/java/org/opendaylight/openflowplugin/simple/OpenFlowPluginWiring.java
@@ -10,8 +10,10 @@ package org.opendaylight.openflowplugin.simple;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.inject.AbstractModule;
 import org.opendaylight.openflowplugin.api.openflow.OpenFlowPluginProviderFactory;
+import org.opendaylight.openflowplugin.api.openflow.configuration.ConfigurationServiceFactory;
 import org.opendaylight.openflowplugin.api.openflow.mastership.MastershipChangeServiceManager;
 import org.opendaylight.openflowplugin.impl.OpenFlowPluginProviderFactoryImpl;
+import org.opendaylight.openflowplugin.impl.configuration.ConfigurationServiceFactoryImpl;
 import org.opendaylight.openflowplugin.impl.mastership.MastershipChangeServiceManagerImpl;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.TransmitPacketInput;
@@ -25,8 +27,7 @@ public class OpenFlowPluginWiring extends AbstractModule {
         bind(PacketProcessingService.class).to(NoPacketProcessingService.class);
 
         bind(OpenFlowPluginProviderFactory.class).to(OpenFlowPluginProviderFactoryImpl.class);
-// see https://jira.opendaylight.org/browse/OPNFLWPLUG-1037
-//        bind(ConfigurationServiceFactory.class).to(ConfigurationServiceFactoryImpl.class);
+        bind(ConfigurationServiceFactory.class).to(ConfigurationServiceFactoryImpl.class);
         bind(MastershipChangeServiceManager.class).to(MastershipChangeServiceManagerImpl.class);
     }
 
@@ -40,6 +41,5 @@ public class OpenFlowPluginWiring extends AbstractModule {
         public ListenableFuture<RpcResult<TransmitPacketOutput>> transmitPacket(TransmitPacketInput input) {
             throw new UnsupportedOperationException("TODO Implement me...");
         }
-
     }
 }