From 96e42aa8b493d8b0c19f19fe1db8aaeaf737e970 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 1 Dec 2022 17:37:25 +0100 Subject: [PATCH] Use current ABIVersion for testing There is no point in cloning messages we use, just use the current ABI version, whichever that is. Change-Id: Id19780dc402077e5c0883db238d4af081112a4c8 Signed-off-by: Robert Varga --- .../databroker/actors/dds/AbstractProxyTransactionTest.java | 6 +++--- .../actors/dds/ClientTransactionCommitCohortTest.java | 2 +- .../actors/dds/DirectTransactionCommitCohortTest.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractProxyTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractProxyTransactionTest.java index c01d84e7f8..08a7011294 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractProxyTransactionTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractProxyTransactionTest.java @@ -109,7 +109,7 @@ public abstract class AbstractProxyTransactionTest connection = AccessClientUtil.createConnectedConnection(context, 0L, backend); @@ -304,7 +304,7 @@ public abstract class AbstractProxyTransactionTest connection = AccessClientUtil.createConnectedConnection(context, 0L, backend); @@ -324,7 +324,7 @@ public abstract class AbstractProxyTransactionTest connection = AccessClientUtil.createConnectedConnection(context, 0L, backend); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransactionCommitCohortTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransactionCommitCohortTest.java index 409dcb58a1..a123b9e509 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransactionCommitCohortTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransactionCommitCohortTest.java @@ -172,7 +172,7 @@ public class ClientTransactionCommitCohortTest { private static TransactionTester createTransactionTester(final TestProbe backendProbe, final ClientActorContext context, final AbstractClientHistory history) { - final ShardBackendInfo backend = new ShardBackendInfo(backendProbe.ref(), 0L, ABIVersion.BORON, + final ShardBackendInfo backend = new ShardBackendInfo(backendProbe.ref(), 0L, ABIVersion.current(), "default", UnsignedLong.ZERO, Optional.empty(), 3); final AbstractClientConnection connection = AccessClientUtil.createConnectedConnection(context, 0L, backend); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/DirectTransactionCommitCohortTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/DirectTransactionCommitCohortTest.java index 6599dc166e..3e42cd279b 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/DirectTransactionCommitCohortTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/DirectTransactionCommitCohortTest.java @@ -100,7 +100,7 @@ public class DirectTransactionCommitCohortTest { private static TransactionTester createTransactionTester(final TestProbe backendProbe, final ClientActorContext context, final AbstractClientHistory history) { - final ShardBackendInfo backend = new ShardBackendInfo(backendProbe.ref(), 0L, ABIVersion.BORON, + final ShardBackendInfo backend = new ShardBackendInfo(backendProbe.ref(), 0L, ABIVersion.current(), "default", UnsignedLong.ZERO, Optional.empty(), 3); final AbstractClientConnection connection = AccessClientUtil.createConnectedConnection(context, 0L, backend); -- 2.36.6