remove bind(PacketProcessingService)

because OpenFlowPluginProviderImpl already creates this (now)

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

diff --git a/TODO.md b/TODO.md
index 2691a53b53b2a4408b29535e2a74b789baae4144..2af0e6f9d022b75429b5d172c865cfb002de3264 100644 (file)
--- a/TODO.md
+++ b/TODO.md
@@ -19,15 +19,15 @@
 
 - [ ] ditch AAA and use Filter from Jetty for BASIC auth instead
 
-- [ ] NeutronWiring with Web API (req. by netvirt, but not genius)
+- [X] NeutronModule with Web API (req. by netvirt, but not genius)
 
 - [ ] ovsdb https://github.com/vorburger/opendaylight-simple/issues/47
 
 - [ ] CDS instead of in-memory DS: [CONTROLLER-1831](https://jira.opendaylight.org/browse/CONTROLLER-1831)
 
 - [X] OpenFlowPlugin wiring ConfigurationServiceFactoryImpl (OPNFLWPLUG-1037)
-- [ ] OpenFlowPluginWiring PacketProcessingService <odl:action-provider>
-- [ ] OpenFlowPlugin wiring
+- [X] OpenFlowPluginWiring PacketProcessingService <odl:action-provider>
+- [X] OpenFlowPlugin wiring
 
 - [X] skitt's https://github.com/vorburger/opendaylight-simple/issues/38
 - [ ] DiagStatusWiring auto-discover ServiceStatusProvider
@@ -40,7 +40,6 @@
 - [ ] why does maven-assembly-plugin dependencySet attempt to constantly re-download all SNAPSHOT unless we use -nsu -o
 - [ ] MINOR: why does "java -jar lib/ch.vorburger.opendaylight.simple.poc-1.5.0-SNAPSHOT.jar" not work?  (MANIFEST.MF has all lib/*)
 
-- [ ] create a Binding Generator? (reflecting upon annotated classes)
 - [X] [re-implement ClassPathScanner](https://github.com/vorburger/opendaylight-simple/pull/18#issuecomment-426859615) using [ClassGraph](https://github.com/classgraph/classgraph) used in [INFRAUTILS-52](https://jira.opendaylight.org/browse/INFRAUTILS-52) (and rename it to something more appropriate)
 
 - [X] read YANG XML configuration files using [DataStoreAppConfigDefaultXMLReader](https://git.opendaylight.org/gerrit/#/c/76416/3/opendaylight/blueprint/src/test/java/org/opendaylight/controller/blueprint/tests/DataStoreAppConfigDefaultXMLReaderTest.java)

diff --git a/src/main/java/org/opendaylight/openflowplugin/simple/OpenFlowPluginWiring.java b/src/main/java/org/opendaylight/openflowplugin/simple/OpenFlowPluginWiring.java
index e65a3d33289683784fea740cab4509538a065f11..3dd73578136338faae91a005ce3827c0cae28371 100644 (file)
--- a/src/main/java/org/opendaylight/openflowplugin/simple/OpenFlowPluginWiring.java
+++ b/src/main/java/org/opendaylight/openflowplugin/simple/OpenFlowPluginWiring.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.openflowplugin.simple;
 
-import com.google.common.util.concurrent.ListenableFuture;
 import com.google.inject.Provides;
 import javax.inject.Singleton;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
@@ -23,12 +22,8 @@ import org.opendaylight.openflowplugin.api.openflow.configuration.ConfigurationS
 import org.opendaylight.openflowplugin.impl.ForwardingPingPongDataBroker;
 import org.opendaylight.openflowplugin.impl.PingPongDataBroker;
 import org.opendaylight.openflowplugin.impl.configuration.ConfigurationServiceFactoryImpl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.TransmitPacketInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.TransmitPacketOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.provider.config.rev160510.OpenflowProviderConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.app.forwardingrules.manager.config.rev160511.ForwardingRulesManagerConfig;
-import org.opendaylight.yangtools.yang.common.RpcResult;
 
 public class OpenFlowPluginWiring extends AutoWiringModule {
 
@@ -40,9 +35,6 @@ public class OpenFlowPluginWiring extends AutoWiringModule {
     protected void configure() {
         super.configure(); // this does the auto-wiring
 
-        // TODO remove NoPacketProcessingService and replace by real PacketProcessingServiceImpl
-        bind(PacketProcessingService.class).to(NoPacketProcessingService.class);
-
         // TODO curious that this is needed despite SwitchConnectionProviderFactoryImpl being annotated?!
         bind(SwitchConnectionProviderFactory.class).to(SwitchConnectionProviderFactoryImpl.class);
     }
@@ -72,16 +64,4 @@ public class OpenFlowPluginWiring extends AutoWiringModule {
     @Singleton ForwardingRulesManagerConfig getForwardingRulesManagerConfig(ConfigReader configReader) {
         return configReader.read("/initial/openflow-frm-config", ForwardingRulesManagerConfig.class);
     }
-
-    private static class NoPacketProcessingService implements PacketProcessingService {
-
-        // TODO <odl:action-provider
-        // interface="org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService"/>
-        // bind(PacketProcessingService.class).to(PacketProcessingServiceImpl.class);
-
-        @Override
-        public ListenableFuture<RpcResult<TransmitPacketOutput>> transmitPacket(TransmitPacketInput input) {
-            throw new UnsupportedOperationException("TODO Implement me...");
-        }
-    }
 }

diff --git a/src/test/java/org/opendaylight/openflowplugin/simple/test/OpenFlowPluginWiringTest.java b/src/test/java/org/opendaylight/openflowplugin/simple/test/OpenFlowPluginWiringTest.java
index d30b5c7997aeb8e7a037282785e38735968bbd14..a44cacf6b98e5b6e655b40ca3e869f23d9162205 100644 (file)
--- a/src/test/java/org/opendaylight/openflowplugin/simple/test/OpenFlowPluginWiringTest.java
+++ b/src/test/java/org/opendaylight/openflowplugin/simple/test/OpenFlowPluginWiringTest.java
@@ -20,6 +20,7 @@ import org.opendaylight.infrautils.simple.DiagStatusWiring;
 import org.opendaylight.infrautils.simple.ReadyWiring;
 import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
 import org.opendaylight.infrautils.web.WebWiring;
+import org.opendaylight.openflowplugin.api.openflow.OpenFlowPluginProvider;
 import org.opendaylight.openflowplugin.simple.OpenFlowPluginWiring;
 import org.opendaylight.serviceutils.simple.ServiceUtilsWiring;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.provider.config.rev160510.OpenflowProviderConfig;
@@ -33,6 +34,7 @@ public class OpenFlowPluginWiringTest extends AbstractSimpleDistributionTest {
             new ControllerWiring(), new DiagStatusWiring(), new WebWiring(), new ReadyWiring(),
             new AnnotationsModule());
 
+    @Inject OpenFlowPluginProvider ofpProvider;
     @Inject OpenflowProviderConfig ofpConfig;
     @Inject ForwardingRulesManagerConfig frmConfig;