Do not use SalFlowService in test-extension

Use just a plain AddFlow RPC, not the deprecated interface.

JIRA: OPNFLWPLUG-1125
Change-Id: Id7512ad832916ac461f4be368cb39c8fe9d13397
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/extension/test-extension/src/main/java/org/opendaylight/openflowplugin/extension/test/Test.java b/extension/test-extension/src/main/java/org/opendaylight/openflowplugin/extension/test/Test.java
index 7cfda7f8585fa1a090eff1c4f0a032fa37ebed38..f4b3c2911995bc34110ef2f7c297eb4dcba1dce5 100644 (file)
--- a/extension/test-extension/src/main/java/org/opendaylight/openflowplugin/extension/test/Test.java
+++ b/extension/test-extension/src/main/java/org/opendaylight/openflowplugin/extension/test/Test.java
@@ -14,9 +14,9 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.DecNwTtlCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.dec.nw.ttl._case.DecNwTtlBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.ActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.AddFlow;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.AddFlowInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.AddFlowInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.SalFlowService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.FlowCookie;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.FlowModFlags;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.InstructionsBuilder;
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
 public class Test implements TestService {
     private static final Logger LOG = LoggerFactory.getLogger(Test.class);
 
-    private SalFlowService flowService;
+    private AddFlow addFlow;
 
     @Override
     public ListenableFuture<RpcResult<TestFlowOutput>> testFlow(final TestFlowInput input) {
@@ -124,12 +124,12 @@ public class Test implements TestService {
     }
 
     private void pushFlowViaRpc(final AddFlowInput addFlowInput) {
-        if (flowService != null) {
-            LoggingFutures.addErrorLogging(flowService.addFlow(addFlowInput), LOG, "addFlow");
+        if (addFlow != null) {
+            LoggingFutures.addErrorLogging(addFlow.invoke(addFlowInput), LOG, "addFlow");
         }
     }
 
-    public void setFlowService(final SalFlowService flowService) {
-        this.flowService = flowService;
+    public void setAddFlow(final AddFlow addFlow) {
+        this.addFlow = addFlow;
     }
 }