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 <robert.varga@pantheon.tech>

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 78039f60167314755379f14756a82243ec86d31d..40f06d10ac90df46d8fbaa74cc0933ac6069d077 100644 (file)
--- 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 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() {
     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 2c5a9bdeab1c80b1a2d83d8c078aeb3e3a0c273a..f28250b766ba86885dd909aac78a91824682f8c4 100644 (file)
--- 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() {
     }
 
     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;
             return NormalizedNodeStreamVersion.SODIUM_SR1;
         } else if (version == DataStoreVersions.NEON_SR2_VERSION) {
             return NormalizedNodeStreamVersion.NEON_SR2;