Teach sal-remoterpc-connector to route actions

[controller.git] / opendaylight / md-sal / sal-remoterpc-connector / src / test / java / org / opendaylight / controller / remote / rpc / OpsBrokerTest.java

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RpcBrokerTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/OpsBrokerTest.java
similarity index 89%
rename from opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RpcBrokerTest.java
rename to opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/OpsBrokerTest.java
index 7ea9191e7c7d4d07e868d94345197ea224b35978..793740c72a3bed2569fb3d9acccb99634ce61941 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RpcBrokerTest.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/OpsBrokerTest.java
@@ -25,7 +25,7 @@ import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult;
 import org.opendaylight.yangtools.util.concurrent.FluentFutures;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 
-public class RpcBrokerTest extends AbstractRpcTest {
+public class OpsBrokerTest extends AbstractOpsTest {
 
     @Test
     public void testExecuteRpc() {
@@ -33,14 +33,13 @@ public class RpcBrokerTest extends AbstractRpcTest {
         final DOMRpcResult rpcResult = new DefaultDOMRpcResult(invokeRpcResult);
         when(domRpcService1.invokeRpc(eq(TEST_RPC_TYPE), any())).thenReturn(
             FluentFutures.immediateFluentFuture(rpcResult));
+        final ExecuteRpc executeRpc = ExecuteRpc.from(TEST_RPC_ID, null);
 
-        final ExecuteRpc executeMsg = ExecuteRpc.from(TEST_RPC_ID, null);
-
-        rpcInvoker1.tell(executeMsg, rpcRegistry1Probe.getRef());
+        rpcInvoker1.tell(executeRpc, rpcRegistry1Probe.getRef());
 
         final RpcResponse rpcResponse = rpcRegistry1Probe.expectMsgClass(Duration.ofSeconds(5), RpcResponse.class);
 
-        assertEquals(rpcResult.getResult(), rpcResponse.getResultNormalizedNode());
+        assertEquals(rpcResult.getResult(), rpcResponse.getOutput());
     }
 
     @Test