From 0fbb20f68591aa8e5c4fa388bc39db5cb1417ae2 Mon Sep 17 00:00:00 2001 From: Oleksandr Zharov Date: Thu, 28 Sep 2023 18:57:49 +0200 Subject: [PATCH] Do not use RpcService in karaf-cli Migrated usage of RpcService to Rpc for karaf-cli. JIRA: CONTROLLER-2085 Change-Id: Ia27b7afda63b9a9208d187a826a14556c30813f9 Signed-off-by: Oleksandr Zharov --- .../it/karaf/cli/car/RegisterCommitCohortCommand.java | 5 ++--- .../it/karaf/cli/car/RegisterLoggingDtclCommand.java | 5 ++--- .../it/karaf/cli/car/RegisterOwnershipCommand.java | 6 +++--- .../clustering/it/karaf/cli/car/StopStressTestCommand.java | 4 ++-- .../clustering/it/karaf/cli/car/StressTestCommand.java | 4 ++-- .../it/karaf/cli/car/UnregisterCommitCohortCommand.java | 5 ++--- .../it/karaf/cli/car/UnregisterLoggingDtclsCommand.java | 5 ++--- .../it/karaf/cli/car/UnregisterOwnershipCommand.java | 7 +++---- .../it/karaf/cli/car/purchase/BuyCarCommand.java | 4 ++-- .../odl/mdsal/lowlevel/control/AddShardReplicaCommand.java | 6 +++--- .../lowlevel/control/CheckPublishNotificationsCommand.java | 6 +++--- .../odl/mdsal/lowlevel/control/IsClientAbortedCommand.java | 5 ++--- .../lowlevel/control/RegisterBoundConstantCommand.java | 6 +++--- .../mdsal/lowlevel/control/RegisterConstantCommand.java | 6 +++--- .../lowlevel/control/RegisterDefaultConstantCommand.java | 6 +++--- .../lowlevel/control/RegisterFlappingSingletonCommand.java | 6 +++--- .../lowlevel/control/RegisterSingletonConstantCommand.java | 6 +++--- .../mdsal/lowlevel/control/RemoveShardReplicaCommand.java | 6 +++--- .../lowlevel/control/ShutdownShardReplicaCommand.java | 6 +++--- .../lowlevel/control/StartPublishNotificationsCommand.java | 6 +++--- .../odl/mdsal/lowlevel/control/SubscribeDdtlCommand.java | 5 ++--- .../odl/mdsal/lowlevel/control/SubscribeDtclCommand.java | 5 ++--- .../odl/mdsal/lowlevel/control/SubscribeYnlCommand.java | 5 ++--- .../lowlevel/control/UnregisterBoundConstantCommand.java | 6 +++--- .../mdsal/lowlevel/control/UnregisterConstantCommand.java | 5 ++--- .../lowlevel/control/UnregisterDefaultConstantCommand.java | 6 +++--- .../control/UnregisterFlappingSingletonCommand.java | 6 +++--- .../control/UnregisterSingletonConstantCommand.java | 6 +++--- .../odl/mdsal/lowlevel/control/UnsubscribeDdtlCommand.java | 5 ++--- .../odl/mdsal/lowlevel/control/UnsubscribeDtclCommand.java | 5 ++--- .../odl/mdsal/lowlevel/control/UnsubscribeYnlCommand.java | 6 +++--- .../mdsal/lowlevel/control/WriteTransactionsCommand.java | 6 +++--- .../clustering/it/karaf/cli/people/AddPersonCommand.java | 4 ++-- .../it/karaf/cli/rpc/test/BasicGlobalCommand.java | 4 ++-- 34 files changed, 86 insertions(+), 98 deletions(-) diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/RegisterCommitCohortCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/RegisterCommitCohortCommand.java index ed42936064..d8606dd2dc 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/RegisterCommitCohortCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/RegisterCommitCohortCommand.java @@ -13,7 +13,7 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.CarService; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.RegisterCommitCohort; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.RegisterCommitCohortInputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -25,7 +25,6 @@ public class RegisterCommitCohortCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(CarService.class) - .registerCommitCohort(new RegisterCommitCohortInputBuilder().build()); + return rpcService.getRpc(RegisterCommitCohort.class).invoke(new RegisterCommitCohortInputBuilder().build()); } } diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/RegisterLoggingDtclCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/RegisterLoggingDtclCommand.java index dba686f5e3..2ff149f227 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/RegisterLoggingDtclCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/RegisterLoggingDtclCommand.java @@ -13,7 +13,7 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.CarService; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.RegisterLoggingDtcl; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.RegisterLoggingDtclInputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -25,7 +25,6 @@ public class RegisterLoggingDtclCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(CarService.class) - .registerLoggingDtcl(new RegisterLoggingDtclInputBuilder().build()); + return rpcService.getRpc(RegisterLoggingDtcl.class).invoke(new RegisterLoggingDtclInputBuilder().build()); } } diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/RegisterOwnershipCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/RegisterOwnershipCommand.java index 5af5cd66d9..02826f767c 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/RegisterOwnershipCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/RegisterOwnershipCommand.java @@ -14,7 +14,7 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.CarService; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.RegisterOwnership; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.RegisterOwnershipInputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -28,7 +28,7 @@ public class RegisterOwnershipCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(CarService.class) - .registerOwnership(new RegisterOwnershipInputBuilder().setCarId(carId).build()); + return rpcService.getRpc(RegisterOwnership.class) + .invoke(new RegisterOwnershipInputBuilder().setCarId(carId).build()); } } diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/StopStressTestCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/StopStressTestCommand.java index 7a41268591..dccdd8fd2b 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/StopStressTestCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/StopStressTestCommand.java @@ -13,7 +13,7 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.CarService; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.StopStressTest; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.StopStressTestInputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -25,6 +25,6 @@ public class StopStressTestCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(CarService.class).stopStressTest(new StopStressTestInputBuilder().build()); + return rpcService.getRpc(StopStressTest.class).invoke(new StopStressTestInputBuilder().build()); } } diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/StressTestCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/StressTestCommand.java index f3bf816d6f..ad0218504b 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/StressTestCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/StressTestCommand.java @@ -14,7 +14,7 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.CarService; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.StressTest; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.StressTestInputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.Uint16; @@ -32,7 +32,7 @@ public class StressTestCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(CarService.class).stressTest(new StressTestInputBuilder() + return rpcService.getRpc(StressTest.class).invoke(new StressTestInputBuilder() .setRate(Uint16.valueOf(rate)) .setCount(Uint32.valueOf(count)) .build()); diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/UnregisterCommitCohortCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/UnregisterCommitCohortCommand.java index c0e0f4efb8..ef7dee5327 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/UnregisterCommitCohortCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/UnregisterCommitCohortCommand.java @@ -13,7 +13,7 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.CarService; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.UnregisterCommitCohort; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.UnregisterCommitCohortInputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -25,7 +25,6 @@ public class UnregisterCommitCohortCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(CarService.class) - .unregisterCommitCohort(new UnregisterCommitCohortInputBuilder().build()); + return rpcService.getRpc(UnregisterCommitCohort.class).invoke(new UnregisterCommitCohortInputBuilder().build()); } } diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/UnregisterLoggingDtclsCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/UnregisterLoggingDtclsCommand.java index e3891fd883..7a74a61de9 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/UnregisterLoggingDtclsCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/UnregisterLoggingDtclsCommand.java @@ -13,7 +13,7 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.CarService; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.UnregisterLoggingDtcls; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.UnregisterLoggingDtclsInputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -25,7 +25,6 @@ public class UnregisterLoggingDtclsCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(CarService.class) - .unregisterLoggingDtcls(new UnregisterLoggingDtclsInputBuilder().build()); + return rpcService.getRpc(UnregisterLoggingDtcls.class).invoke(new UnregisterLoggingDtclsInputBuilder().build()); } } diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/UnregisterOwnershipCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/UnregisterOwnershipCommand.java index bb8bf0e14a..c59a057093 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/UnregisterOwnershipCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/UnregisterOwnershipCommand.java @@ -14,11 +14,10 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.CarService; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.UnregisterOwnership; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.UnregisterOwnershipInputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; - @Service @Command(scope = "test-app", name = "unregister-ownership", description = "Run an unregister-ownership test") public class UnregisterOwnershipCommand extends AbstractRpcAction { @@ -29,7 +28,7 @@ public class UnregisterOwnershipCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(CarService.class) - .unregisterOwnership(new UnregisterOwnershipInputBuilder().setCarId(carId).build()); + return rpcService.getRpc(UnregisterOwnership.class) + .invoke(new UnregisterOwnershipInputBuilder().setCarId(carId).build()); } } diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/purchase/BuyCarCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/purchase/BuyCarCommand.java index 3290f9de82..21dca83149 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/purchase/BuyCarCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/car/purchase/BuyCarCommand.java @@ -15,8 +15,8 @@ import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.clustering.it.karaf.cli.InstanceIdentifierSupport; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.purchase.rev140818.BuyCar; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.purchase.rev140818.BuyCarInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.purchase.rev140818.CarPurchaseService; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.CarId; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.people.rev140818.PersonId; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.people.rev140818.PersonRef; @@ -38,7 +38,7 @@ public class BuyCarCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(CarPurchaseService.class).buyCar(new BuyCarInputBuilder() + return rpcService.getRpc(BuyCar.class).invoke(new BuyCarInputBuilder() .setPerson(new PersonRef(iidSupport.parseArgument(personRef))) .setCarId(carId) .setPersonId(personId) diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/AddShardReplicaCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/AddShardReplicaCommand.java index 4169f70de0..ca65c4584a 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/AddShardReplicaCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/AddShardReplicaCommand.java @@ -14,8 +14,8 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; +import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.AddShardReplica; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.AddShardReplicaInputBuilder; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.OdlMdsalLowlevelControlService; import org.opendaylight.yangtools.yang.common.RpcResult; @Service @@ -28,7 +28,7 @@ public class AddShardReplicaCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(OdlMdsalLowlevelControlService.class) - .addShardReplica(new AddShardReplicaInputBuilder().setShardName(shardName).build()); + return rpcService.getRpc(AddShardReplica.class) + .invoke(new AddShardReplicaInputBuilder().setShardName(shardName).build()); } } diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/CheckPublishNotificationsCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/CheckPublishNotificationsCommand.java index fe8cf7e1a1..0bf748d125 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/CheckPublishNotificationsCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/CheckPublishNotificationsCommand.java @@ -14,8 +14,8 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; +import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.CheckPublishNotifications; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.CheckPublishNotificationsInputBuilder; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.OdlMdsalLowlevelControlService; import org.opendaylight.yangtools.yang.common.RpcResult; @Service @@ -29,8 +29,8 @@ public class CheckPublishNotificationsCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(OdlMdsalLowlevelControlService.class) - .checkPublishNotifications(new CheckPublishNotificationsInputBuilder() + return rpcService.getRpc(CheckPublishNotifications.class) + .invoke(new CheckPublishNotificationsInputBuilder() .setId(id) .build()); } diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/IsClientAbortedCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/IsClientAbortedCommand.java index 0b238ee9f2..de64791a5c 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/IsClientAbortedCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/IsClientAbortedCommand.java @@ -13,8 +13,8 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; +import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.IsClientAborted; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.IsClientAbortedInputBuilder; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.OdlMdsalLowlevelControlService; import org.opendaylight.yangtools.yang.common.RpcResult; @Service @@ -25,7 +25,6 @@ public class IsClientAbortedCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(OdlMdsalLowlevelControlService.class) - .isClientAborted(new IsClientAbortedInputBuilder().build()); + return rpcService.getRpc(IsClientAborted.class).invoke(new IsClientAbortedInputBuilder().build()); } } diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/RegisterBoundConstantCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/RegisterBoundConstantCommand.java index ff9105304c..cdb01dae3f 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/RegisterBoundConstantCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/RegisterBoundConstantCommand.java @@ -15,7 +15,7 @@ import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.clustering.it.karaf.cli.InstanceIdentifierSupport; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.OdlMdsalLowlevelControlService; +import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.RegisterBoundConstant; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.RegisterBoundConstantInputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -33,8 +33,8 @@ public class RegisterBoundConstantCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(OdlMdsalLowlevelControlService.class) - .registerBoundConstant(new RegisterBoundConstantInputBuilder() + return rpcService.getRpc(RegisterBoundConstant.class) + .invoke(new RegisterBoundConstantInputBuilder() .setConstant(constant) .setContext(iidSupport.parseArgument(context)) .build()); diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/RegisterConstantCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/RegisterConstantCommand.java index b114949397..6886b8285a 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/RegisterConstantCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/RegisterConstantCommand.java @@ -14,7 +14,7 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.OdlMdsalLowlevelControlService; +import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.RegisterConstant; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.RegisterConstantInputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -28,7 +28,7 @@ public class RegisterConstantCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(OdlMdsalLowlevelControlService.class) - .registerConstant(new RegisterConstantInputBuilder().setConstant(constant).build()); + return rpcService.getRpc(RegisterConstant.class) + .invoke(new RegisterConstantInputBuilder().setConstant(constant).build()); } } diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/RegisterDefaultConstantCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/RegisterDefaultConstantCommand.java index 4095c3c29f..3a30bd2a71 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/RegisterDefaultConstantCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/RegisterDefaultConstantCommand.java @@ -14,7 +14,7 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.OdlMdsalLowlevelControlService; +import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.RegisterDefaultConstant; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.RegisterDefaultConstantInputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -28,8 +28,8 @@ public class RegisterDefaultConstantCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(OdlMdsalLowlevelControlService.class) - .registerDefaultConstant(new RegisterDefaultConstantInputBuilder() + return rpcService.getRpc(RegisterDefaultConstant.class) + .invoke(new RegisterDefaultConstantInputBuilder() .setConstant(constant) .build()); } diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/RegisterFlappingSingletonCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/RegisterFlappingSingletonCommand.java index 8bd75fb0b7..38cdf7940b 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/RegisterFlappingSingletonCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/RegisterFlappingSingletonCommand.java @@ -13,7 +13,7 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.OdlMdsalLowlevelControlService; +import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.RegisterFlappingSingleton; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.RegisterFlappingSingletonInputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -26,7 +26,7 @@ public class RegisterFlappingSingletonCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(OdlMdsalLowlevelControlService.class) - .registerFlappingSingleton(new RegisterFlappingSingletonInputBuilder().build()); + return rpcService.getRpc(RegisterFlappingSingleton.class) + .invoke(new RegisterFlappingSingletonInputBuilder().build()); } } diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/RegisterSingletonConstantCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/RegisterSingletonConstantCommand.java index 64be2ed577..12c4d50b4b 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/RegisterSingletonConstantCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/RegisterSingletonConstantCommand.java @@ -14,7 +14,7 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.OdlMdsalLowlevelControlService; +import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.RegisterSingletonConstant; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.RegisterSingletonConstantInputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -29,8 +29,8 @@ public class RegisterSingletonConstantCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(OdlMdsalLowlevelControlService.class) - .registerSingletonConstant(new RegisterSingletonConstantInputBuilder() + return rpcService.getRpc(RegisterSingletonConstant.class) + .invoke(new RegisterSingletonConstantInputBuilder() .setConstant(constant) .build()); diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/RemoveShardReplicaCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/RemoveShardReplicaCommand.java index 2565156812..e2d042ba5a 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/RemoveShardReplicaCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/RemoveShardReplicaCommand.java @@ -14,7 +14,7 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.OdlMdsalLowlevelControlService; +import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.RemoveShardReplica; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.RemoveShardReplicaInputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -28,7 +28,7 @@ public class RemoveShardReplicaCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(OdlMdsalLowlevelControlService.class) - .removeShardReplica(new RemoveShardReplicaInputBuilder().setShardName(shardName).build()); + return rpcService.getRpc(RemoveShardReplica.class) + .invoke(new RemoveShardReplicaInputBuilder().setShardName(shardName).build()); } } diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/ShutdownShardReplicaCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/ShutdownShardReplicaCommand.java index f8f025370e..22c3a860bd 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/ShutdownShardReplicaCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/ShutdownShardReplicaCommand.java @@ -14,7 +14,7 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.OdlMdsalLowlevelControlService; +import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.ShutdownShardReplica; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.ShutdownShardReplicaInputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -28,8 +28,8 @@ public class ShutdownShardReplicaCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(OdlMdsalLowlevelControlService.class) - .shutdownShardReplica(new ShutdownShardReplicaInputBuilder() + return rpcService.getRpc(ShutdownShardReplica.class) + .invoke(new ShutdownShardReplicaInputBuilder() .setShardName(shardName) .build()); } diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/StartPublishNotificationsCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/StartPublishNotificationsCommand.java index 68be7e30be..e7a2821338 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/StartPublishNotificationsCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/StartPublishNotificationsCommand.java @@ -14,7 +14,7 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.OdlMdsalLowlevelControlService; +import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.StartPublishNotifications; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.StartPublishNotificationsInputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.Uint32; @@ -34,8 +34,8 @@ public class StartPublishNotificationsCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(OdlMdsalLowlevelControlService.class) - .startPublishNotifications(new StartPublishNotificationsInputBuilder() + return rpcService.getRpc(StartPublishNotifications.class) + .invoke(new StartPublishNotificationsInputBuilder() .setId(id) .setSeconds(Uint32.valueOf(seconds)) .setNotificationsPerSecond(Uint32.valueOf(notificationsPerSecond)) diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/SubscribeDdtlCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/SubscribeDdtlCommand.java index 3a58f63b90..226e12daf0 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/SubscribeDdtlCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/SubscribeDdtlCommand.java @@ -13,7 +13,7 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.OdlMdsalLowlevelControlService; +import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.SubscribeDdtl; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.SubscribeDdtlInputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -25,7 +25,6 @@ public class SubscribeDdtlCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(OdlMdsalLowlevelControlService.class) - .subscribeDdtl(new SubscribeDdtlInputBuilder().build()); + return rpcService.getRpc(SubscribeDdtl.class).invoke(new SubscribeDdtlInputBuilder().build()); } } diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/SubscribeDtclCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/SubscribeDtclCommand.java index 4c20e60569..1533feab89 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/SubscribeDtclCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/SubscribeDtclCommand.java @@ -13,7 +13,7 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.OdlMdsalLowlevelControlService; +import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.SubscribeDtcl; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.SubscribeDtclInputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -25,7 +25,6 @@ public class SubscribeDtclCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(OdlMdsalLowlevelControlService.class) - .subscribeDtcl(new SubscribeDtclInputBuilder().build()); + return rpcService.getRpc(SubscribeDtcl.class).invoke(new SubscribeDtclInputBuilder().build()); } } diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/SubscribeYnlCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/SubscribeYnlCommand.java index 00e6fa4c15..324874b050 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/SubscribeYnlCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/SubscribeYnlCommand.java @@ -14,7 +14,7 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.OdlMdsalLowlevelControlService; +import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.SubscribeYnl; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.SubscribeYnlInputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -28,7 +28,6 @@ public class SubscribeYnlCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(OdlMdsalLowlevelControlService.class) - .subscribeYnl(new SubscribeYnlInputBuilder().setId(id).build()); + return rpcService.getRpc(SubscribeYnl.class).invoke(new SubscribeYnlInputBuilder().setId(id).build()); } } diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnregisterBoundConstantCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnregisterBoundConstantCommand.java index 3cc086efa6..7b799c69d9 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnregisterBoundConstantCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnregisterBoundConstantCommand.java @@ -15,7 +15,7 @@ import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.clustering.it.karaf.cli.InstanceIdentifierSupport; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.OdlMdsalLowlevelControlService; +import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.UnregisterBoundConstant; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.UnregisterBoundConstantInputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -31,8 +31,8 @@ public class UnregisterBoundConstantCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(OdlMdsalLowlevelControlService.class) - .unregisterBoundConstant(new UnregisterBoundConstantInputBuilder() + return rpcService.getRpc(UnregisterBoundConstant.class) + .invoke(new UnregisterBoundConstantInputBuilder() .setContext(iidSupport.parseArgument(context)) .build()); } diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnregisterConstantCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnregisterConstantCommand.java index da761b3e3a..0923fafaf4 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnregisterConstantCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnregisterConstantCommand.java @@ -13,7 +13,7 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.OdlMdsalLowlevelControlService; +import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.UnregisterConstant; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.UnregisterConstantInputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -25,7 +25,6 @@ public class UnregisterConstantCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(OdlMdsalLowlevelControlService.class) - .unregisterConstant(new UnregisterConstantInputBuilder().build()); + return rpcService.getRpc(UnregisterConstant.class).invoke(new UnregisterConstantInputBuilder().build()); } } diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnregisterDefaultConstantCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnregisterDefaultConstantCommand.java index 565b72dc33..3c7aa47d8d 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnregisterDefaultConstantCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnregisterDefaultConstantCommand.java @@ -13,7 +13,7 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.OdlMdsalLowlevelControlService; +import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.UnregisterDefaultConstant; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.UnregisterDefaultConstantInputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -26,7 +26,7 @@ public class UnregisterDefaultConstantCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(OdlMdsalLowlevelControlService.class) - .unregisterDefaultConstant(new UnregisterDefaultConstantInputBuilder().build()); + return rpcService.getRpc(UnregisterDefaultConstant.class) + .invoke(new UnregisterDefaultConstantInputBuilder().build()); } } diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnregisterFlappingSingletonCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnregisterFlappingSingletonCommand.java index de7cc5b7c2..b3c58de98e 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnregisterFlappingSingletonCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnregisterFlappingSingletonCommand.java @@ -13,7 +13,7 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.OdlMdsalLowlevelControlService; +import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.UnregisterFlappingSingleton; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.UnregisterFlappingSingletonInputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -26,7 +26,7 @@ public class UnregisterFlappingSingletonCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(OdlMdsalLowlevelControlService.class) - .unregisterFlappingSingleton(new UnregisterFlappingSingletonInputBuilder().build()); + return rpcService.getRpc(UnregisterFlappingSingleton.class) + .invoke(new UnregisterFlappingSingletonInputBuilder().build()); } } diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnregisterSingletonConstantCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnregisterSingletonConstantCommand.java index 7923430f06..f66004902b 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnregisterSingletonConstantCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnregisterSingletonConstantCommand.java @@ -13,7 +13,7 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.OdlMdsalLowlevelControlService; +import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.UnregisterSingletonConstant; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.UnregisterSingletonConstantInputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -26,7 +26,7 @@ public class UnregisterSingletonConstantCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(OdlMdsalLowlevelControlService.class) - .unregisterSingletonConstant(new UnregisterSingletonConstantInputBuilder().build()); + return rpcService.getRpc(UnregisterSingletonConstant.class) + .invoke(new UnregisterSingletonConstantInputBuilder().build()); } } diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnsubscribeDdtlCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnsubscribeDdtlCommand.java index b44639d423..05e6e0c9c5 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnsubscribeDdtlCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnsubscribeDdtlCommand.java @@ -13,7 +13,7 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.OdlMdsalLowlevelControlService; +import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.UnsubscribeDdtl; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.UnsubscribeDdtlInputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -25,7 +25,6 @@ public class UnsubscribeDdtlCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(OdlMdsalLowlevelControlService.class) - .unsubscribeDdtl(new UnsubscribeDdtlInputBuilder().build()); + return rpcService.getRpc(UnsubscribeDdtl.class).invoke(new UnsubscribeDdtlInputBuilder().build()); } } diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnsubscribeDtclCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnsubscribeDtclCommand.java index 99ab3dcce9..1a49af459f 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnsubscribeDtclCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnsubscribeDtclCommand.java @@ -13,7 +13,7 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.OdlMdsalLowlevelControlService; +import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.UnsubscribeDtcl; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.UnsubscribeDtclInputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -25,7 +25,6 @@ public class UnsubscribeDtclCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(OdlMdsalLowlevelControlService.class) - .unsubscribeDtcl(new UnsubscribeDtclInputBuilder().build()); + return rpcService.getRpc(UnsubscribeDtcl.class).invoke(new UnsubscribeDtclInputBuilder().build()); } } diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnsubscribeYnlCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnsubscribeYnlCommand.java index cd01e0cc1d..94a84ac358 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnsubscribeYnlCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/UnsubscribeYnlCommand.java @@ -14,7 +14,7 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.OdlMdsalLowlevelControlService; +import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.UnsubscribeYnl; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.UnsubscribeYnlInputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -28,8 +28,8 @@ public class UnsubscribeYnlCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(OdlMdsalLowlevelControlService.class) - .unsubscribeYnl(new UnsubscribeYnlInputBuilder() + return rpcService.getRpc(UnsubscribeYnl.class) + .invoke(new UnsubscribeYnlInputBuilder() .setId(id) .build()); } diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/WriteTransactionsCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/WriteTransactionsCommand.java index ad90f8733a..ace506c726 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/WriteTransactionsCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/odl/mdsal/lowlevel/control/WriteTransactionsCommand.java @@ -14,7 +14,7 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; -import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.OdlMdsalLowlevelControlService; +import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.WriteTransactions; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.WriteTransactionsInputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.Uint32; @@ -35,8 +35,8 @@ public class WriteTransactionsCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(OdlMdsalLowlevelControlService.class) - .writeTransactions(new WriteTransactionsInputBuilder() + return rpcService.getRpc(WriteTransactions.class) + .invoke(new WriteTransactionsInputBuilder() .setId(id) .setSeconds(Uint32.valueOf(seconds)) .setTransactionsPerSecond(Uint32.valueOf(transactionsPerSecond)) diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/people/AddPersonCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/people/AddPersonCommand.java index b6697f5659..24159ad4cc 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/people/AddPersonCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/people/AddPersonCommand.java @@ -14,8 +14,8 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.people.rev140818.AddPerson; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.people.rev140818.AddPersonInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.people.rev140818.PeopleService; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.people.rev140818.PersonId; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.Uint32; @@ -38,7 +38,7 @@ public class AddPersonCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(PeopleService.class).addPerson(new AddPersonInputBuilder() + return rpcService.getRpc(AddPerson.class).invoke(new AddPersonInputBuilder() .setId(id) .setGender(gender) .setAge(Uint32.valueOf(age)) diff --git a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/rpc/test/BasicGlobalCommand.java b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/rpc/test/BasicGlobalCommand.java index fa88ed0c82..f344d9cd60 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/rpc/test/BasicGlobalCommand.java +++ b/opendaylight/md-sal/samples/clustering-test-app/karaf-cli/src/main/java/org/opendaylight/clustering/it/karaf/cli/rpc/test/BasicGlobalCommand.java @@ -13,8 +13,8 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.opendaylight.clustering.it.karaf.cli.AbstractRpcAction; import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.controller.basic.rpc.test.rev160120.BasicGlobal; import org.opendaylight.yang.gen.v1.urn.opendaylight.controller.basic.rpc.test.rev160120.BasicGlobalInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.controller.basic.rpc.test.rev160120.BasicRpcTestService; import org.opendaylight.yangtools.yang.common.RpcResult; @Service @@ -25,6 +25,6 @@ public class BasicGlobalCommand extends AbstractRpcAction { @Override protected ListenableFuture> invokeRpc() { - return rpcService.getRpcService(BasicRpcTestService.class).basicGlobal(new BasicGlobalInputBuilder().build()); + return rpcService.getRpc(BasicGlobal.class).invoke(new BasicGlobalInputBuilder().build()); } } -- 2.36.6