Teach sal-remoterpc-connector to route actions

[controller.git] / benchmark / rpcbenchmark / src / main / java / rpcbenchmark / impl / RpcbenchmarkProvider.java

diff --git a/benchmark/rpcbenchmark/src/main/java/rpcbenchmark/impl/RpcbenchmarkProvider.java b/benchmark/rpcbenchmark/src/main/java/rpcbenchmark/impl/RpcbenchmarkProvider.java
index 14358eac0e174000d56109dc0c9ee6f85f67a8fc..8e8e31e97527ef09cb1749cb6b82cb0c64ec9df9 100644 (file)
--- a/benchmark/rpcbenchmark/src/main/java/rpcbenchmark/impl/RpcbenchmarkProvider.java
+++ b/benchmark/rpcbenchmark/src/main/java/rpcbenchmark/impl/RpcbenchmarkProvider.java
@@ -5,21 +5,16 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package rpcbenchmark.impl;
 
+import com.google.common.util.concurrent.ListenableFuture;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
-
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcRegistration;
-import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
-import org.opendaylight.controller.sal.binding.api.RpcConsumerRegistry;
 import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
 import org.opendaylight.yang.gen.v1.rpcbench.payload.rev150702.NodeContext;
 import org.opendaylight.yang.gen.v1.rpcbench.payload.rev150702.RpcbenchPayloadService;
@@ -30,6 +25,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rpcbench
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rpcbenchmark.rev150702.StartTestInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rpcbenchmark.rev150702.StartTestOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rpcbenchmark.rev150702.StartTestOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rpcbenchmark.rev150702.TestStatusInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rpcbenchmark.rev150702.TestStatusOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rpcbenchmark.rev150702.TestStatusOutput.ExecStatus;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rpcbenchmark.rev150702.TestStatusOutputBuilder;
@@ -40,35 +36,32 @@ import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class RpcbenchmarkProvider implements BindingAwareProvider, AutoCloseable, RpcbenchmarkService {
+public class RpcbenchmarkProvider implements AutoCloseable, RpcbenchmarkService {
 
     private static final Logger LOG = LoggerFactory.getLogger(RpcbenchmarkProvider.class);
-    private static final GlobalBindingRTCServer gServer = new GlobalBindingRTCServer();
     private static final int testTimeout = 5;
+
+    private final GlobalBindingRTCServer globalServer;
     private final AtomicReference<ExecStatus> execStatus = new AtomicReference<>(ExecStatus.Idle);
-    private RpcConsumerRegistry consumerRegistry;
-    private RpcProviderRegistry providerRegistry;
+    private final RpcProviderRegistry providerRegistry;
 
-    @Override
-    public void onSessionInitiated(ProviderContext session) {
-        LOG.info("RpcbenchmarkProvider Session Initiated");
-        consumerRegistry = session.getSALService(RpcConsumerRegistry.class);
-        providerRegistry = session.getSALService(RpcProviderRegistry.class);
-
-        // Register the benchmark Global RPC
-        session.addRpcImplementation(RpcbenchPayloadService.class, gServer);
-        // Register RPC Benchmark's control REST API
-        session.addRpcImplementation(RpcbenchmarkService.class, this);
+    public RpcbenchmarkProvider(final RpcProviderRegistry providerRegistry, final GlobalBindingRTCServer globalServer) {
+        this.providerRegistry = providerRegistry;
+        this.globalServer = globalServer;
+    }
+
+    public void init() {
+        LOG.info("RpcbenchmarkProvider initiated");
     }
 
     @Override
-    public void close() throws Exception {
-        LOG.info("RpcbenchmarkProvider Closed");
+    public void close() {
+        LOG.info("RpcbenchmarkProvider closed");
     }
 
     @Override
-    public Future<RpcResult<StartTestOutput>> startTest(final StartTestInput input) {
-        LOG.info("startTest {}", input);
+    public ListenableFuture<RpcResult<StartTestOutput>> startTest(final StartTestInput input) {
+        LOG.debug("startTest {}", input);
 
         final RTCClient client;
         final List<RoutedRpcRegistration<?>> rpcRegs = new ArrayList<>();
@@ -90,11 +83,11 @@ public class RpcbenchmarkProvider implements BindingAwareProvider, AutoCloseable
                 rpcRegs.add(routedReg);
             }
 
-            client = new RoutedBindingRTClient(consumerRegistry, input.getPayloadSize().intValue(), routeIid);
+            client = new RoutedBindingRTClient(providerRegistry, input.getPayloadSize().intValue(), routeIid);
             break;
 
         case GLOBALRTC:
-            client = new GlobalBindingRTCClient(consumerRegistry, input.getPayloadSize().intValue());
+            client = new GlobalBindingRTCClient(providerRegistry, input.getPayloadSize().intValue());
             break;
 
         default:
@@ -105,12 +98,7 @@ public class RpcbenchmarkProvider implements BindingAwareProvider, AutoCloseable
         try {
             ExecutorService executor = Executors.newFixedThreadPool(input.getNumClients().intValue());
 
-            final Runnable testRun = new Runnable() {
-                @Override
-                public void run() {
-                    client.runTest(input.getIterations().intValue());
-                }
-            };
+            final Runnable testRun = () -> client.runTest(input.getIterations().intValue());
 
             LOG.info("Test Started");
             long startTime = System.nanoTime();
@@ -122,8 +110,8 @@ public class RpcbenchmarkProvider implements BindingAwareProvider, AutoCloseable
             executor.shutdown();
             try {
                 executor.awaitTermination(testTimeout, TimeUnit.MINUTES);
-            } catch (InterruptedException e) {
-                LOG.error("Out of time: test did not finish within the {} min deadline ", testTimeout); 
+            } catch (final InterruptedException e) {
+                LOG.error("Out of time: test did not finish within the {} min deadline ", testTimeout);
             }
 
             long endTime = System.nanoTime();
@@ -136,7 +124,7 @@ public class RpcbenchmarkProvider implements BindingAwareProvider, AutoCloseable
                                             .setGlobalRtcClientError(client.getRpcError())
                                             .setGlobalRtcClientOk(client.getRpcOk())
                                             .setExecTime(TimeUnit.NANOSECONDS.toMillis(elapsedTime))
-                                            .setRate(((client.getRpcOk() + client.getRpcError()) * 1000000000) / elapsedTime)
+                                            .setRate((client.getRpcOk() + client.getRpcError()) * 1000000000 / elapsedTime)
                                             .build();
             return RpcResultBuilder.success(output).buildFuture();
         } finally {
@@ -147,10 +135,10 @@ public class RpcbenchmarkProvider implements BindingAwareProvider, AutoCloseable
     }
 
     @Override
-    public Future<RpcResult<TestStatusOutput>> testStatus() {
+    public ListenableFuture<RpcResult<TestStatusOutput>> testStatus(final TestStatusInput input) {
         LOG.info("testStatus");
         TestStatusOutput output = new TestStatusOutputBuilder()
-                                        .setGlobalServerCnt((long)gServer.getNumRpcs())
+                                        .setGlobalServerCnt((long)globalServer.getNumRpcs())
                                         .setExecStatus(execStatus.get())
                                         .build();
         return RpcResultBuilder.success(output).buildFuture();