Add cds-access-api MAGNESIUM version

This adds a new ABI version, which uses Magnesium normalized node
stream.

JIRA: CONTROLLER-1919
Change-Id: Ie27b6cbd090b6f155c9600055ac6ef12304b1a99
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/ABIVersion.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/ABIVersion.java
index ee70447cb9471d8396e3b5b82428ec18ecea495b..90949db842bd6755ff13bd6331e83f99517d87ec 100644 (file)
--- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/ABIVersion.java
+++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/ABIVersion.java
@@ -70,6 +70,16 @@ public enum ABIVersion implements WritableObject {
             return NormalizedNodeStreamVersion.SODIUM_SR1;
         }
     },
             return NormalizedNodeStreamVersion.SODIUM_SR1;
         }
     },

+    /**
+     * Revised ABI version. The messages remain the same as {@link #BORON}, but messages bearing QNames in any shape
+     * are using {@link NormalizedNodeStreamVersion#MAGNESIUM}, which improves encoding.
+     */
+    MAGNESIUM(8) {
+        @Override
+        public NormalizedNodeStreamVersion getStreamVersion() {
+            return NormalizedNodeStreamVersion.MAGNESIUM;
+        }
+    },

 
     /**
      * Version which is newer than any other version. This version exists purely for testing purposes.
 
     /**
      * Version which is newer than any other version. This version exists purely for testing purposes.


@@ -133,8 +143,10 @@ public enum ABIVersion implements WritableObject {
                 return NEON_SR2;
             case 7:
                 return SODIUM_SR1;
                 return NEON_SR2;
             case 7:
                 return SODIUM_SR1;

+            case 8:
+                return MAGNESIUM;

             default:
             default:

-                throw new FutureVersionException(value, SODIUM_SR1);
+                throw new FutureVersionException(value, MAGNESIUM);

         }
     }
 
         }
     }
 

diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/Message.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/Message.java
index 1d198fc8a9c9f8039b9f5cc6955e3a37230f0d98..5456fbb19ee97cffeb90da346ebfab99e4b32d70 100644 (file)
--- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/Message.java
+++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/Message.java
@@ -114,6 +114,7 @@ public abstract class Message<T extends WritableIdentifier, C extends Message<T,
             case BORON:
             case NEON_SR2:
             case SODIUM_SR1:
             case BORON:
             case NEON_SR2:
             case SODIUM_SR1:

+            case MAGNESIUM:

                 return verifyNotNull(cloneAsVersion(toVersion));
             case TEST_PAST_VERSION:
             case TEST_FUTURE_VERSION:
                 return verifyNotNull(cloneAsVersion(toVersion));
             case TEST_PAST_VERSION:
             case TEST_FUTURE_VERSION: