Bump upstreams
[bgpcep.git] / bgp / benchmark-app / src / main / java / org / opendaylight / protocol / bgp / benchmark / app / AppPeerBenchmark.java
index 81efd3d241721d2ee60dc9682424f8d0aec3d5fd..04cb1bcc94c6ff09b5ce1f61a95ab4267be83899 100644 (file)
  * 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 org.opendaylight.protocol.bgp.benchmark.app;
 
+import static java.util.Objects.requireNonNull;
+import static org.opendaylight.protocol.bgp.parser.spi.PathIdUtil.NON_PATH_ID;
+
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Stopwatch;
+import com.google.common.collect.ImmutableClassToInstanceMap;
 import com.google.common.net.InetAddresses;
-import java.util.Collections;
-import java.util.concurrent.Future;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
-import org.opendaylight.controller.md.sal.binding.api.BindingTransactionChain;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionChain;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RpcRegistration;
-import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.RpcProviderService;
+import org.opendaylight.mdsal.binding.api.TransactionChain;
+import org.opendaylight.mdsal.binding.api.WriteTransaction;
+import org.opendaylight.mdsal.common.api.CommitInfo;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev150305.application.rib.tables.routes.Ipv4RoutesCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev150305.ipv4.routes.Ipv4Routes;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev150305.ipv4.routes.Ipv4RoutesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev150305.ipv4.routes.ipv4.routes.Ipv4Route;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev150305.ipv4.routes.ipv4.routes.Ipv4RouteBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev150305.ipv4.routes.ipv4.routes.Ipv4RouteKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.PathId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.Attributes;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.AttributesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.attributes.AsPath;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.attributes.AsPathBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.attributes.LocalPref;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.attributes.LocalPrefBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.attributes.MultiExitDisc;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.attributes.MultiExitDiscBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.attributes.Origin;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.attributes.OriginBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.ApplicationRib;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.ApplicationRibBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.ApplicationRibId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.ApplicationRibKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.rib.Tables;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.rib.TablesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.rib.TablesKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.BgpOrigin;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.Ipv4AddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.UnicastSubsequentAddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.Ipv4NextHopCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.ipv4.next.hop._case.Ipv4NextHopBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.app.peer.benchmark.rev160309.AddPrefixInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.app.peer.benchmark.rev160309.AddPrefixOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.app.peer.benchmark.rev160309.AddPrefixOutputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.app.peer.benchmark.rev160309.DeletePrefixInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.app.peer.benchmark.rev160309.DeletePrefixOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.app.peer.benchmark.rev160309.DeletePrefixOutputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.app.peer.benchmark.rev160309.OdlBgpAppPeerBenchmarkService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.app.peer.benchmark.rev160309.output.Result;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.app.peer.benchmark.rev160309.output.ResultBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.application.rib.tables.routes.Ipv4RoutesCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.bgp.rib.rib.loc.rib.tables.routes.Ipv4RoutesCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.routes.Ipv4Routes;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.routes.Ipv4RoutesBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.routes.ipv4.routes.Ipv4Route;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.routes.ipv4.routes.Ipv4RouteBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.routes.ipv4.routes.Ipv4RouteKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.path.attributes.Attributes;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.path.attributes.AttributesBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.path.attributes.attributes.AsPath;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.path.attributes.attributes.AsPathBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.path.attributes.attributes.LocalPref;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.path.attributes.attributes.LocalPrefBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.path.attributes.attributes.MultiExitDisc;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.path.attributes.attributes.MultiExitDiscBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.path.attributes.attributes.Origin;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.path.attributes.attributes.OriginBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.ApplicationRib;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.ApplicationRibBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.ApplicationRibId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.ApplicationRibKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.Tables;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.TablesBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.TablesKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.BgpOrigin;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.Ipv4AddressFamily;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.UnicastSubsequentAddressFamily;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.next.hop.c.next.hop.Ipv4NextHopCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.next.hop.c.next.hop.ipv4.next.hop._case.Ipv4NextHopBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.app.peer.benchmark.rev200120.AddPrefix;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.app.peer.benchmark.rev200120.AddPrefixInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.app.peer.benchmark.rev200120.AddPrefixOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.app.peer.benchmark.rev200120.AddPrefixOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.app.peer.benchmark.rev200120.DeletePrefix;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.app.peer.benchmark.rev200120.DeletePrefixInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.app.peer.benchmark.rev200120.DeletePrefixOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.app.peer.benchmark.rev200120.DeletePrefixOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.app.peer.benchmark.rev200120.output.Result;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.app.peer.benchmark.rev200120.output.ResultBuilder;
+import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.Rpc;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
+import org.opendaylight.yangtools.yang.common.Empty;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
+import org.opendaylight.yangtools.yang.common.Uint32;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class AppPeerBenchmark implements OdlBgpAppPeerBenchmarkService, TransactionChainListener, AutoCloseable {
+public final class AppPeerBenchmark implements FutureCallback<Empty>, AutoCloseable {
 
     private static final Logger LOG = LoggerFactory.getLogger(AppPeerBenchmark.class);
 
     private static final AsPath AS_PATH = new AsPathBuilder().build();
     private static final Origin ORIGIN = new OriginBuilder().setValue(BgpOrigin.Igp).build();
-    private static final MultiExitDisc MED = new MultiExitDiscBuilder().setMed(0L).build();
-    private static final LocalPref LOC_PREF = new LocalPrefBuilder().setPref(100L).build();
+    private static final MultiExitDisc MED = new MultiExitDiscBuilder().setMed(Uint32.ZERO).build();
+    private static final LocalPref LOC_PREF = new LocalPrefBuilder().setPref(Uint32.valueOf(100)).build();
+    private static final Map<TablesKey, Tables> EMPTY_TABLES = BindingMap.of(new TablesBuilder()
+        .setAfi(Ipv4AddressFamily.VALUE).setSafi(UnicastSubsequentAddressFamily.VALUE).setRoutes(
+            new Ipv4RoutesCaseBuilder().setIpv4Routes(new Ipv4RoutesBuilder().setIpv4Route(Map.of())
+                .build()).build()).build());
 
     private static final String SLASH = "/";
     private static final String PREFIX = SLASH + "32";
 
-    private static final PathId PATH_ID = new PathId(0L);
-
-    private final BindingTransactionChain txChain;
-    private final RpcRegistration<OdlBgpAppPeerBenchmarkService> rpcRegistration;
-    private final InstanceIdentifier<ApplicationRib> iid;
+    private final TransactionChain txChain;
+    private final Registration rpcRegistration;
+    private final InstanceIdentifier<ApplicationRib> appIID;
     private final InstanceIdentifier<Ipv4Routes> routesIId;
+    private final String appRibId;
 
-    public AppPeerBenchmark(final DataBroker bindingDataBroker, final RpcProviderRegistry rpcProviderRegistry,
+    public AppPeerBenchmark(final DataBroker bindingDataBroker, final RpcProviderService rpcProviderRegistry,
             final String appRibId) {
-        this.txChain = bindingDataBroker.createTransactionChain(this);
-        this.iid = initTable(appRibId);
-        final InstanceIdentifier tablesIId = this.iid
-                .child(Tables.class, new TablesKey(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class));
-        this.routesIId = tablesIId.child(Ipv4Routes.class);
-        this.rpcRegistration = rpcProviderRegistry.addRpcImplementation(OdlBgpAppPeerBenchmarkService.class, this);
+        this.appRibId = requireNonNull(appRibId);
+        txChain = bindingDataBroker.createMergingTransactionChain();
+        txChain.addCallback(this);
+
+        appIID = InstanceIdentifier.builder(ApplicationRib.class,
+            new ApplicationRibKey(new ApplicationRibId(appRibId))).build();
+        routesIId = appIID
+            .child(Tables.class, new TablesKey(Ipv4AddressFamily.VALUE, UnicastSubsequentAddressFamily.VALUE))
+            .child(Ipv4RoutesCase.class, Ipv4Routes.class);
+        rpcRegistration = rpcProviderRegistry.registerRpcImplementations(
+            ImmutableClassToInstanceMap.<Rpc<?, ?>>builder()
+                .put(AddPrefix.class, this::addPrefix)
+                .put(DeletePrefix.class, this::deletePrefix)
+                .build());
         LOG.info("BGP Application Peer Benchmark Application started.");
     }
 
-    @Override
-    public void onTransactionChainFailed(final TransactionChain<?, ?> chain, final AsyncTransaction<?, ?> transaction,
-            final Throwable cause) {
-        LOG.error("Broken chain {} in DatastoreBaAbstractWrite, transaction {}, cause {}", chain,
-                transaction.getIdentifier(), cause);
-        close();
+    public void start() {
+        LOG.debug("Instantiating App Peer Benchmark : {}", appRibId);
+        final ApplicationRib appRib = new ApplicationRibBuilder().setId(new ApplicationRibId(
+            new ApplicationRibId(appRibId))).setTables(EMPTY_TABLES).build();
+
+        final WriteTransaction wTx = txChain.newWriteOnlyTransaction();
+        wTx.put(LogicalDatastoreType.CONFIGURATION, appIID, appRib);
+        wTx.commit().addCallback(new FutureCallback<CommitInfo>() {
+            @Override
+            public void onSuccess(final CommitInfo result) {
+                LOG.info("Empty Structure created for Application Peer Benchmark {}", appRibId);
+            }
+
+            @Override
+            public void onFailure(final Throwable throwable) {
+                LOG.error("Failed to create Empty Structure for Application Peer Benchmark {}", appRibId, throwable);
+            }
+        }, MoreExecutors.directExecutor());
     }
 
     @Override
-    public void onTransactionChainSuccessful(final TransactionChain<?, ?> chain) {
-        LOG.debug("DatastoreBaAbstractWrite closed successfully, chain {}", chain);
+    public void onFailure(final Throwable cause) {
+        LOG.error("Broken chain in DatastoreBaAbstractWrite", cause);
+        close();
     }
 
-    private InstanceIdentifier<ApplicationRib> initTable(final String appRibId) {
-        final Tables tables = new TablesBuilder()
-                .setAfi(Ipv4AddressFamily.class)
-                .setSafi(UnicastSubsequentAddressFamily.class)
-                .setRoutes(
-                        new Ipv4RoutesCaseBuilder().setIpv4Routes(
-                                new Ipv4RoutesBuilder().setIpv4Route(Collections.emptyList()).build())
-                                .build()).build();
-
-        final ApplicationRib appRib = new ApplicationRibBuilder()
-                .setId(new ApplicationRibId(new ApplicationRibId(appRibId)))
-                .setTables(Collections.singletonList(tables)).build();
-
-        final InstanceIdentifier<ApplicationRib> ribIID = KeyedInstanceIdentifier.builder(ApplicationRib.class,
-                new ApplicationRibKey(new ApplicationRibId(appRibId))).build();
-        final WriteTransaction wTx = this.txChain.newWriteOnlyTransaction();
-        wTx.put(LogicalDatastoreType.CONFIGURATION, ribIID, appRib);
-        wTx.submit();
-        return ribIID;
+    @Override
+    public void onSuccess(final Empty result) {
+        LOG.debug("DatastoreBaAbstractWrite closed successfully");
     }
 
-    @Override
-    public Future<RpcResult<AddPrefixOutput>> addPrefix(final AddPrefixInput input) {
+    @VisibleForTesting
+    ListenableFuture<RpcResult<AddPrefixOutput>> addPrefix(final AddPrefixInput input) {
         final long duration = addRoute(input.getPrefix(), input.getNexthop(), input.getCount(), input.getBatchsize());
         final long rate = countRate(duration, input.getCount());
 
-        final AddPrefixOutputBuilder outputbuilder = new AddPrefixOutputBuilder();
-        outputbuilder.setResult(createResult(input.getCount(), duration, rate));
-        final AddPrefixOutput output = outputbuilder.build();
-        return RpcResultBuilder.success(output).buildFuture();
+        return RpcResultBuilder.success(
+            new AddPrefixOutputBuilder().setResult(createResult(input.getCount(), duration, rate)).build())
+            .buildFuture();
     }
 
-    @Override
-    public Future<RpcResult<DeletePrefixOutput>> deletePrefix(final DeletePrefixInput input) {
+    @VisibleForTesting
+    ListenableFuture<RpcResult<DeletePrefixOutput>> deletePrefix(final DeletePrefixInput input) {
         final long duration = deleteRoute(input.getPrefix(), input.getCount(), input.getBatchsize());
         final long rate = countRate(duration, input.getCount());
 
-        final DeletePrefixOutputBuilder outputbuilder = new DeletePrefixOutputBuilder();
-        outputbuilder.setResult(createResult(input.getCount(), duration, rate));
-        final DeletePrefixOutput output = outputbuilder.build();
-        return RpcResultBuilder.success(output).buildFuture();
+        return RpcResultBuilder.success(
+            new DeletePrefixOutputBuilder().setResult(createResult(input.getCount(), duration, rate)).build())
+            .buildFuture();
     }
 
     @Override
     public void close() {
-        this.rpcRegistration.close();
-        final WriteTransaction dTx = this.txChain.newWriteOnlyTransaction();
-        dTx.delete(LogicalDatastoreType.CONFIGURATION, this.iid);
+        rpcRegistration.close();
+        final WriteTransaction dTx = txChain.newWriteOnlyTransaction();
+        dTx.delete(LogicalDatastoreType.CONFIGURATION, appIID);
         try {
-            dTx.submit().checkedGet();
-        } catch (final TransactionCommitFailedException e) {
+            dTx.commit().get();
+        } catch (final InterruptedException | ExecutionException e) {
             LOG.warn("Failed to clean-up BGP Application RIB.", e);
         }
-        this.txChain.close();
+        txChain.close();
         LOG.info("BGP Application Peer Benchmark Application closed.");
     }
 
-    private long addRoute(final Ipv4Prefix ipv4Prefix, final Ipv4Address nextHop, final long count, final long batch) {
-        final AttributesBuilder attributesBuilder = new AttributesBuilder();
-        attributesBuilder.setCNextHop(new Ipv4NextHopCaseBuilder().setIpv4NextHop(
-                new Ipv4NextHopBuilder().setGlobal(new Ipv4Address(nextHop)).build()).build());
-        attributesBuilder.setMultiExitDisc(MED);
-        attributesBuilder.setLocalPref(LOC_PREF);
-        attributesBuilder.setOrigin(ORIGIN);
-        attributesBuilder.setAsPath(AS_PATH);
-        final Attributes attributes = attributesBuilder.build();
-        return processRoutes(ipv4Prefix, count, batch, attributes);
+    @VisibleForTesting
+    InstanceIdentifier<Ipv4Routes> getIpv4RoutesIID() {
+        return routesIId;
     }
 
-    private long deleteRoute(final Ipv4Prefix ipv4Prefix, final long count, final long batch) {
+    private long addRoute(final Ipv4Prefix ipv4Prefix, final Ipv4AddressNoZone nextHop, final Uint32 count,
+            final Uint32 batch) {
+        return processRoutes(ipv4Prefix, count, batch, new AttributesBuilder()
+            .setCNextHop(new Ipv4NextHopCaseBuilder()
+                .setIpv4NextHop(new Ipv4NextHopBuilder().setGlobal(nextHop).build())
+                .build())
+            .setMultiExitDisc(MED)
+            .setLocalPref(LOC_PREF)
+            .setOrigin(ORIGIN)
+            .setAsPath(AS_PATH)
+            .build());
+    }
+
+    private long deleteRoute(final Ipv4Prefix ipv4Prefix, final Uint32 count, final Uint32 batch) {
         return processRoutes(ipv4Prefix, count, batch, null);
     }
 
-    private long processRoutes(final Ipv4Prefix ipv4Prefix, final long count, final long batch, final Attributes attributes) {
-        WriteTransaction wTx = this.txChain.newWriteOnlyTransaction();
+    private long processRoutes(final Ipv4Prefix ipv4Prefix, final Uint32 count, final Uint32 batch,
+        final Attributes attributes) {
+        WriteTransaction wt = txChain.newWriteOnlyTransaction();
         String address = getAdddressFromPrefix(ipv4Prefix);
+        final long countLong = count.longValue();
+        final long batchLong = batch.longValue();
         final Stopwatch stopwatch = Stopwatch.createStarted();
-        for (int i = 1; i <= count; i++) {
-            final Ipv4RouteKey routeKey = new Ipv4RouteKey(PATH_ID, createPrefix(address));
-            final KeyedInstanceIdentifier<Ipv4Route, Ipv4RouteKey> routeIId = this.routesIId.child(Ipv4Route.class, routeKey);
+        for (int i = 1; i <= countLong; i++) {
+            final Ipv4RouteKey routeKey = new Ipv4RouteKey(NON_PATH_ID, createKey(address));
+            final KeyedInstanceIdentifier<Ipv4Route, Ipv4RouteKey> routeIId =
+                routesIId.child(Ipv4Route.class, routeKey);
             if (attributes != null) {
-                final Ipv4RouteBuilder ipv4RouteBuilder = new Ipv4RouteBuilder();
-                ipv4RouteBuilder.setPrefix(routeKey.getPrefix());
-                ipv4RouteBuilder.setKey(routeKey);
-                ipv4RouteBuilder.setAttributes(attributes);
-                final Ipv4Route ipv4Route = ipv4RouteBuilder.build();
-                wTx.put(LogicalDatastoreType.CONFIGURATION, routeIId,
-                        ipv4Route);
+                wt.put(LogicalDatastoreType.CONFIGURATION, routeIId, new Ipv4RouteBuilder()
+                    .setRouteKey(routeKey.getRouteKey())
+                    .setPrefix(new Ipv4Prefix(routeKey.getRouteKey()))
+                    .withKey(routeKey)
+                    .setAttributes(attributes)
+                    .build());
             } else {
-                wTx.delete(LogicalDatastoreType.CONFIGURATION, routeIId);
+                wt.delete(LogicalDatastoreType.CONFIGURATION, routeIId);
             }
-            if (i % batch == 0) {
-                wTx.submit();
-                wTx = this.txChain.newWriteOnlyTransaction();
+            if (i % batchLong == 0) {
+                wt.commit().addCallback(new FutureCallback<CommitInfo>() {
+                    @Override
+                    public void onSuccess(final CommitInfo result) {
+                        LOG.trace("Successful commit");
+                    }
+
+                    @Override
+                    public void onFailure(final Throwable trw) {
+                        LOG.error("Failed commit", trw);
+                    }
+                }, MoreExecutors.directExecutor());
+                wt = txChain.newWriteOnlyTransaction();
             }
             address = increasePrefix(address);
         }
-        wTx.submit();
+        wt.commit().addCallback(new FutureCallback<CommitInfo>() {
+            @Override
+            public void onSuccess(final CommitInfo result) {
+                LOG.trace("Route batch stored.");
+            }
+
+            @Override
+            public void onFailure(final Throwable throwable) {
+                LOG.error("Failed to store route batch.", throwable);
+            }
+        }, MoreExecutors.directExecutor());
         return stopwatch.stop().elapsed(TimeUnit.MILLISECONDS);
     }
 
-    private static long countRate(final long durationMillis, final long count) {
+    private static long countRate(final long durationMillis, final Uint32 count) {
         final long durationSec = TimeUnit.MILLISECONDS.toSeconds(durationMillis);
         if (durationSec != 0) {
-            return count / durationSec;
+            return count.toJava() / durationSec;
         }
-        return count;
+        return count.toJava();
     }
 
     private static String increasePrefix(final String prefix) {
         return InetAddresses.increment(InetAddresses.forString(prefix)).getHostAddress();
     }
 
-    private static Result createResult(final long count, final long duration, final long rate) {
-        return new ResultBuilder().setCount(count).setDuration(duration).setRate(rate).build();
+    private static Result createResult(final Uint32 count, final long duration, final long rate) {
+        return new ResultBuilder().setCount(count).setDuration(Uint32.valueOf(duration)).setRate(Uint32.valueOf(rate))
+                .build();
     }
 
     private static String getAdddressFromPrefix(final Ipv4Prefix prefix) {
         return prefix.getValue().split(SLASH)[0];
     }
 
-    private static Ipv4Prefix createPrefix(final String address) {
-        return new Ipv4Prefix(address + PREFIX);
+    private static String createKey(final String address) {
+        return address + PREFIX;
     }
-}
\ No newline at end of file
+}