From c9587253579a7b34f4c397a254f83890d4d3ba03 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 25 Sep 2019 12:38:17 +0200 Subject: [PATCH] Define DataStoreVersions.MAGNESIUM_VERSION This adds Magnesium version, which is using Magnesium normalized node stream. JIRA: CONTROLLER-1919 Change-Id: Icc1314d61e37b8a4bf2df759860b4d0bc170c90c Signed-off-by: Robert Varga --- .../controller/cluster/datastore/DataStoreVersions.java | 1 + .../datastore/messages/VersionedExternalizableMessage.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataStoreVersions.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataStoreVersions.java index 78039f6016..40f06d10ac 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataStoreVersions.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataStoreVersions.java @@ -25,6 +25,7 @@ public final class DataStoreVersions { public static final short FLUORINE_VERSION = 9; public static final short NEON_SR2_VERSION = 10; public static final short SODIUM_SR1_VERSION = 11; + public static final short MAGNESIUM_VERSION = 12; public static final short CURRENT_VERSION = NEON_SR2_VERSION; private DataStoreVersions() { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/VersionedExternalizableMessage.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/VersionedExternalizableMessage.java index 2c5a9bdeab..f28250b766 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/VersionedExternalizableMessage.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/VersionedExternalizableMessage.java @@ -37,7 +37,9 @@ public abstract class VersionedExternalizableMessage implements Externalizable, } protected final @NonNull NormalizedNodeStreamVersion getStreamVersion() { - if (version >= DataStoreVersions.SODIUM_SR1_VERSION) { + if (version >= DataStoreVersions.MAGNESIUM_VERSION) { + return NormalizedNodeStreamVersion.MAGNESIUM; + } else if (version == DataStoreVersions.SODIUM_SR1_VERSION) { return NormalizedNodeStreamVersion.SODIUM_SR1; } else if (version == DataStoreVersions.NEON_SR2_VERSION) { return NormalizedNodeStreamVersion.NEON_SR2; -- 2.36.6