import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
+import com.google.common.collect.HashMultimap;
import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Multimap;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.MoreExecutors;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.opendaylight.controller.md.sal.dom.api.DOMRpcIdentifier;
+import org.opendaylight.controller.md.sal.dom.api.DOMRpcProviderService;
+import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult;
+import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;
+import org.opendaylight.controller.md.sal.dom.spi.DefaultDOMRpcResult;
import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
import org.opendaylight.controller.sal.binding.test.util.BindingBrokerTestFactory;
import org.opendaylight.controller.sal.binding.test.util.BindingTestContext;
-import org.opendaylight.controller.sal.core.api.RpcImplementation;
-import org.opendaylight.controller.sal.core.api.RpcProvisionRegistry;
+import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMRpcProviderServiceAdapter;
+import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.of.migration.test.model.rev150210.KnockKnockInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.of.migration.test.model.rev150210.KnockKnockInputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.of.migration.test.model.rev150210.KnockKnockOutput;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
-import org.opendaylight.yangtools.yang.data.api.CompositeNode;
-import org.opendaylight.yangtools.yang.data.impl.CompositeNodeTOImpl;
-import java.util.Collections;
-import java.util.Set;
-import java.util.concurrent.Future;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
public class CrossBrokerRpcTest {
protected RpcProviderRegistry providerRegistry;
- protected RpcProvisionRegistry provisionRegistry;
+ protected DOMRpcProviderService provisionRegistry;
private BindingTestContext testContext;
- private RpcImplementation biRpcInvoker;
+ private DOMRpcService biRpcInvoker;
private MessageCapturingFlowService knockService;
public static final TopLevelListKey NODE_A = new TopLevelListKey("a");
private static final QName NODE_ID_QNAME = QName.create(TopLevelList.QNAME, "name");
private static final QName KNOCK_KNOCK_QNAME = QName.create(KnockKnockOutput.QNAME, "knock-knock");
+ private static final SchemaPath KNOCK_KNOCK_PATH = SchemaPath.create(true, KNOCK_KNOCK_QNAME);
public static final InstanceIdentifier<Top> NODES_PATH = InstanceIdentifier.builder(Top.class).build();
public static final InstanceIdentifier<TopLevelList> BA_NODE_A_ID = NODES_PATH.child(TopLevelList.class, NODE_A);
public static final InstanceIdentifier<TopLevelList> BA_NODE_B_ID = NODES_PATH.child(TopLevelList.class, NODE_B);
public static final InstanceIdentifier<TopLevelList> BA_NODE_C_ID = NODES_PATH.child(TopLevelList.class, NODE_C);
- public static final org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier BI_NODE_C_ID = createBINodeIdentifier(NODE_C);
+ public static final org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier BI_NODE_C_ID =
+ createBINodeIdentifier(NODE_C);
@Before
- public void setup() {
+ public void setup() throws Exception {
BindingBrokerTestFactory testFactory = new BindingBrokerTestFactory();
- testFactory.setExecutor(MoreExecutors.sameThreadExecutor());
- testFactory.setStartWithParsedSchema(true);
+ testFactory.setExecutor(MoreExecutors.newDirectExecutorService());
testContext = testFactory.getTestContext();
+ testContext.setSchemaModuleInfos(ImmutableSet.of(
+ BindingReflections.getModuleInfo(OpendaylightOfMigrationTestModelService.class)));
testContext.start();
providerRegistry = testContext.getBindingRpcRegistry();
provisionRegistry = testContext.getDomRpcRegistry();
}
+ @After
+ public void teardown() {
+ testContext.close();
+ }
+
+ @Test
+ public void testBindingRpcShortcutRegisteredViaLegacyAPI()
+ throws InterruptedException, ExecutionException, TimeoutException {
+ final ListenableFuture<RpcResult<KnockKnockOutput>> knockResult = knockResult(true, "open");
+ knockService.registerPath(TestContext.class, BA_NODE_A_ID).setKnockKnockResult(knockResult);
+
+ OpendaylightOfMigrationTestModelService baKnockInvoker =
+ providerRegistry.getRpcService(OpendaylightOfMigrationTestModelService.class);
+
+ final KnockKnockInput knockInput = knockKnock(BA_NODE_A_ID).setQuestion("Who's there?").build();
+ ListenableFuture<RpcResult<KnockKnockOutput>> future = baKnockInvoker.knockKnock(knockInput);
+
+ final RpcResult<KnockKnockOutput> rpcResult = future.get(5, TimeUnit.SECONDS);
+
+ assertEquals(knockResult.get().getResult().getClass(), rpcResult.getResult().getClass());
+ assertSame(knockResult.get().getResult(), rpcResult.getResult());
+ assertSame(knockInput, knockService.getReceivedKnocks().get(BA_NODE_A_ID).iterator().next());
+ }
+
+ @Test
+ public void testBindingRpcShortcutRegisteredViaMdsalAPI()
+ throws InterruptedException, ExecutionException, TimeoutException {
+ final ListenableFuture<RpcResult<KnockKnockOutput>> knockResult = knockResult(true, "open");
+
+ BindingDOMRpcProviderServiceAdapter mdsalServiceRegistry = new BindingDOMRpcProviderServiceAdapter(
+ testContext.getDelegateDomRouter().getRpcProviderService(), testContext.getCodec());
+
+ final Multimap<InstanceIdentifier<?>, KnockKnockInput> receivedKnocks = HashMultimap.create();
+ mdsalServiceRegistry.registerRpcImplementation(OpendaylightOfMigrationTestModelService.class,
+ (OpendaylightOfMigrationTestModelService) input -> {
+ receivedKnocks.put(input.getKnockerId(), input);
+ return knockResult;
+ }, ImmutableSet.of(BA_NODE_A_ID));
+
+ OpendaylightOfMigrationTestModelService baKnockInvoker =
+ providerRegistry.getRpcService(OpendaylightOfMigrationTestModelService.class);
+
+ final KnockKnockInput knockInput = knockKnock(BA_NODE_A_ID).setQuestion("Who's there?").build();
+ Future<RpcResult<KnockKnockOutput>> future = baKnockInvoker.knockKnock(knockInput);
+
+ final RpcResult<KnockKnockOutput> rpcResult = future.get(5, TimeUnit.SECONDS);
+
+ assertEquals(knockResult.get().getResult().getClass(), rpcResult.getResult().getClass());
+ assertSame(knockResult.get().getResult(), rpcResult.getResult());
+ assertSame(knockInput, receivedKnocks.get(BA_NODE_A_ID).iterator().next());
+ }
+
@Test
public void bindingRoutedRpcProvider_DomInvokerTest() throws Exception {
KnockKnockInput knockKnockA = knockKnock(BA_NODE_A_ID) //
.setQuestion("who's there?").build();
- CompositeNode knockKnockDom = toDomRpc(KNOCK_KNOCK_QNAME, knockKnockA);
+ ContainerNode knockKnockDom = toDomRpc(KNOCK_KNOCK_QNAME, knockKnockA);
assertNotNull(knockKnockDom);
- RpcResult<CompositeNode> domResult = biRpcInvoker.invokeRpc(KNOCK_KNOCK_QNAME, knockKnockDom).get();
+ DOMRpcResult domResult = biRpcInvoker.invokeRpc(KNOCK_KNOCK_PATH, knockKnockDom).get();
assertNotNull(domResult);
- assertTrue("DOM result is successful.", domResult.isSuccessful());
+ assertNotNull("DOM result is successful.", domResult.getResult());
assertTrue("Bidning Add Flow RPC was captured.", knockService.getReceivedKnocks().containsKey(BA_NODE_A_ID));
assertEquals(knockKnockA, knockService.getReceivedKnocks().get(BA_NODE_A_ID).iterator().next());
}
KnockKnockOutputBuilder builder = new KnockKnockOutputBuilder();
builder.setAnswer("open");
final KnockKnockOutput output = builder.build();
- org.opendaylight.controller.sal.core.api.Broker.RoutedRpcRegistration registration = provisionRegistry.addRoutedRpcImplementation(KNOCK_KNOCK_QNAME, new RpcImplementation() {
- @Override
- public Set<QName> getSupportedRpcs() {
- return ImmutableSet.of(KNOCK_KNOCK_QNAME);
- }
-
- @Override
- public ListenableFuture<RpcResult<CompositeNode>> invokeRpc(QName rpc, CompositeNode input) {
- CompositeNode result = testContext.getBindingToDomMappingService().toDataDom(output);
- return Futures.immediateFuture(RpcResultBuilder.<CompositeNode>success(result).build());
- }
- });
- registration.registerPath(TestContext.QNAME, BI_NODE_C_ID);
+ provisionRegistry.registerRpcImplementation((rpc, input) -> {
+ ContainerNode result = testContext.getCodec().getCodecFactory().toNormalizedNodeRpcData(output);
+ return Futures.immediateCheckedFuture(new DefaultDOMRpcResult(result));
+ }, DOMRpcIdentifier.create(KNOCK_KNOCK_PATH, BI_NODE_C_ID));
OpendaylightOfMigrationTestModelService baKnockInvoker =
providerRegistry.getRpcService(OpendaylightOfMigrationTestModelService.class);
- Future<RpcResult<KnockKnockOutput>> baResult = baKnockInvoker.knockKnock((knockKnock(BA_NODE_C_ID).setQuestion("Who's there?").build()));
+ Future<RpcResult<KnockKnockOutput>> baResult = baKnockInvoker.knockKnock(knockKnock(BA_NODE_C_ID)
+ .setQuestion("Who's there?").build());
assertNotNull(baResult);
assertEquals(output, baResult.get().getResult());
}
- private CompositeNode toDomRpcInput(DataObject addFlowA) {
- return testContext.getBindingToDomMappingService().toDataDom(addFlowA);
- }
-
- @After
- public void teardown() throws Exception {
- testContext.close();
+ private ContainerNode toDomRpcInput(final DataObject addFlowA) {
+ return testContext.getCodec().getCodecFactory().toNormalizedNodeRpcData(addFlowA);
}
- private static org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier createBINodeIdentifier(TopLevelListKey listKey) {
+ private static org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier createBINodeIdentifier(
+ final TopLevelListKey listKey) {
return org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.builder().node(Top.QNAME)
- .nodeWithKey(TopLevelList.QNAME, NODE_ID_QNAME, listKey.getName()).toInstance();
+ .node(TopLevelList.QNAME)
+ .nodeWithKey(TopLevelList.QNAME, NODE_ID_QNAME, listKey.getName()).build();
}
- private Future<RpcResult<KnockKnockOutput>> knockResult(boolean success, String answer) {
- KnockKnockOutput output = new KnockKnockOutputBuilder() //
- .setAnswer(answer).build();
- RpcResult<KnockKnockOutput> result = RpcResultBuilder.<KnockKnockOutput>status(success).withResult(output).build();
+ private static ListenableFuture<RpcResult<KnockKnockOutput>> knockResult(final boolean success,
+ final String answer) {
+ KnockKnockOutput output = new KnockKnockOutputBuilder().setAnswer(answer).build();
+ RpcResult<KnockKnockOutput> result = RpcResultBuilder.<KnockKnockOutput>status(success).withResult(output)
+ .build();
return Futures.immediateFuture(result);
}
- private static KnockKnockInputBuilder knockKnock(InstanceIdentifier<TopLevelList> listId) {
+ private static KnockKnockInputBuilder knockKnock(final InstanceIdentifier<TopLevelList> listId) {
KnockKnockInputBuilder builder = new KnockKnockInputBuilder();
builder.setKnockerId(listId);
return builder;
}
- private CompositeNode toDomRpc(QName rpcName, KnockKnockInput knockInput) {
- return new CompositeNodeTOImpl(rpcName, null,
- Collections.<org.opendaylight.yangtools.yang.data.api.Node<?>>singletonList(toDomRpcInput(knockInput)));
+ private ContainerNode toDomRpc(final QName rpcName, final KnockKnockInput knockInput) {
+ return toDomRpcInput(knockInput);
}
}
Code Review / controller.git / blobdiff