Adding fingerprints to avoid interference between clusters.

Change-Id: I5e5278916f8b9b900d7d403b6d08f1f66a866fb2

@@ -48,7 +48,8 @@ public class NettyMessagingManager extends NettyMessaging {
     public void activate() throws Exception {
     public void activate() throws Exception {
         ControllerNode localNode = clusterMetadataService.getLocalNode();
         ControllerNode localNode = clusterMetadataService.getLocalNode();
         getTlsParameters();
         getTlsParameters();
-        super.start(new Endpoint(localNode.ip(), localNode.tcpPort()));
+        super.start(clusterMetadataService.getClusterMetadata().getName().hashCode(),
+                    new Endpoint(localNode.ip(), localNode.tcpPort()));
         log.info("Started");
         log.info("Started");
     }
     }
 
 

-#!/usr/bin/env python 
-'''
+#!/usr/bin/env python
+"""
   Generate the partitions json file from the $OC* environment variables
   Generate the partitions json file from the $OC* environment variables
-  
+
   Usage: onos-gen-partitions [output file]
   Usage: onos-gen-partitions [output file]
   If output file is not provided, the json is written to stdout.
   If output file is not provided, the json is written to stdout.
-'''
+"""
 
 
 from os import environ
 from os import environ
 from collections import deque, OrderedDict
 from collections import deque, OrderedDict
 import re
 import re
 import json
 import json
 import sys
 import sys
+import random
+import string
 
 
-convert = lambda text: int(text) if text.isdigit() else text.lower() 
-alphanum_key = lambda key: [convert(c) for c in re.split('([0-9]+)', key)] 
+convert = lambda text: int(text) if text.isdigit() else text.lower()
+alphanum_key = lambda key: [convert(c) for c in re.split('([0-9]+)', key)]
 
 
 def get_OC_vars():
 def get_OC_vars():
   vars = []
   vars = []
@@ -42,10 +44,13 @@ if __name__ == '__main__':
   vars = get_OC_vars()
   vars = get_OC_vars()
   nodes = get_nodes(vars)
   nodes = get_nodes(vars)
   partitions = generate_permutations([v.get('id') for v in nodes], 3)
   partitions = generate_permutations([v.get('id') for v in nodes], 3)
+  name = 0
+  for node in nodes:
+      name = name ^ node['ip']
   data = {
   data = {
-           'name': 'default',
+           'name': name,
            'nodes': nodes,
            'nodes': nodes,
-           'partitions': partitions 
+           'partitions': partitions
          }
          }
   output = json.dumps(data, indent=4)
   output = json.dumps(data, indent=4)
 
 

@@ -19,6 +19,7 @@ package org.onlab.netty;
  * State transitions a decoder goes through as it is decoding an incoming message.
  * State transitions a decoder goes through as it is decoding an incoming message.
  */
  */
 public enum DecoderState {
 public enum DecoderState {
+    READ_MESSAGE_PREAMBLE,
     READ_MESSAGE_ID,
     READ_MESSAGE_ID,
     READ_SENDER_IP_VERSION,
     READ_SENDER_IP_VERSION,
     READ_SENDER_IP,
     READ_SENDER_IP,

@@ -16,6 +16,7 @@
 package org.onlab.netty;
 package org.onlab.netty;
 
 
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Preconditions.checkState;
+
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ReplayingDecoder;
 import io.netty.handler.codec.ReplayingDecoder;
@@ -37,7 +38,9 @@ public class MessageDecoder extends ReplayingDecoder<DecoderState> {
 
 
     private final Logger log = LoggerFactory.getLogger(getClass());
     private final Logger log = LoggerFactory.getLogger(getClass());
 
 
+    private final int correctPreamble;
     private long messageId;
     private long messageId;
+    private int preamble;
     private Version ipVersion;
     private Version ipVersion;
     private IpAddress senderIp;
     private IpAddress senderIp;
     private int senderPort;
     private int senderPort;
@@ -45,8 +48,9 @@ public class MessageDecoder extends ReplayingDecoder<DecoderState> {
     private String messageType;
     private String messageType;
     private int contentLength;
     private int contentLength;
 
 
-    public MessageDecoder() {
-        super(DecoderState.READ_MESSAGE_ID);
+    public MessageDecoder(int correctPreamble) {
+        super(DecoderState.READ_MESSAGE_PREAMBLE);
+        this.correctPreamble = correctPreamble;
     }
     }
 
 
     @Override
     @Override
@@ -56,6 +60,12 @@ public class MessageDecoder extends ReplayingDecoder<DecoderState> {
             List<Object> out) throws Exception {
             List<Object> out) throws Exception {
 
 
         switch (state()) {
         switch (state()) {
+        case READ_MESSAGE_PREAMBLE:
+            preamble = buffer.readInt();
+            if (preamble != correctPreamble) {
+                throw new IllegalStateException("This message had an incorrect preamble.");
+            }
+            checkpoint(DecoderState.READ_MESSAGE_ID);
         case READ_MESSAGE_ID:
         case READ_MESSAGE_ID:
             messageId = buffer.readLong();
             messageId = buffer.readLong();
             checkpoint(DecoderState.READ_SENDER_IP_VERSION);
             checkpoint(DecoderState.READ_SENDER_IP_VERSION);
@@ -63,9 +73,9 @@ public class MessageDecoder extends ReplayingDecoder<DecoderState> {
             ipVersion = buffer.readByte() == 0x0 ? Version.INET : Version.INET6;
             ipVersion = buffer.readByte() == 0x0 ? Version.INET : Version.INET6;
             checkpoint(DecoderState.READ_SENDER_IP);
             checkpoint(DecoderState.READ_SENDER_IP);
         case READ_SENDER_IP:
         case READ_SENDER_IP:
-            byte[] octects = new byte[IpAddress.byteLength(ipVersion)];
-            buffer.readBytes(octects);
-            senderIp = IpAddress.valueOf(ipVersion, octects);
+            byte[] octets = new byte[IpAddress.byteLength(ipVersion)];
+            buffer.readBytes(octets);
+            senderIp = IpAddress.valueOf(ipVersion, octets);
             checkpoint(DecoderState.READ_SENDER_PORT);
             checkpoint(DecoderState.READ_SENDER_PORT);
         case READ_SENDER_PORT:
         case READ_SENDER_PORT:
             senderPort = buffer.readInt();
             senderPort = buffer.readInt();
@@ -82,15 +92,15 @@ public class MessageDecoder extends ReplayingDecoder<DecoderState> {
             contentLength = buffer.readInt();
             contentLength = buffer.readInt();
             checkpoint(DecoderState.READ_CONTENT);
             checkpoint(DecoderState.READ_CONTENT);
         case READ_CONTENT:
         case READ_CONTENT:
+            //TODO Perform a sanity check on the size before allocating
             byte[] payload = new byte[contentLength];
             byte[] payload = new byte[contentLength];
             buffer.readBytes(payload);
             buffer.readBytes(payload);
-            InternalMessage message = new InternalMessage(
-                    messageId,
+            InternalMessage message = new InternalMessage(messageId,
                     new Endpoint(senderIp, senderPort),
                     new Endpoint(senderIp, senderPort),
                     messageType,
                     messageType,
                     payload);
                     payload);
             out.add(message);
             out.add(message);
-            checkpoint(DecoderState.READ_MESSAGE_ID);
+            checkpoint(DecoderState.READ_MESSAGE_PREAMBLE);
             break;
             break;
          default:
          default:
             checkState(false, "Must not be here");
             checkState(false, "Must not be here");

@@ -36,6 +36,13 @@ import com.google.common.base.Charsets;
 @Sharable
 @Sharable
 public class MessageEncoder extends MessageToByteEncoder<InternalMessage> {
 public class MessageEncoder extends MessageToByteEncoder<InternalMessage> {
 
 
+    private final int preamble;
+
+    public MessageEncoder(int preamble) {
+        super();
+        this.preamble = preamble;
+    }
+
     private final Logger log = LoggerFactory.getLogger(getClass());
     private final Logger log = LoggerFactory.getLogger(getClass());
 
 
     @Override
     @Override
@@ -44,6 +51,8 @@ public class MessageEncoder extends MessageToByteEncoder<InternalMessage> {
             InternalMessage message,
             InternalMessage message,
             ByteBuf out) throws Exception {
             ByteBuf out) throws Exception {
 
 
+        out.writeInt(this.preamble);
+
         // write message id
         // write message id
         out.writeLong(message.id());
         out.writeLong(message.id());
 
 

@@ -74,6 +74,7 @@ public class NettyMessaging implements MessagingService {
     private static final String REPLY_MESSAGE_TYPE = "NETTY_MESSAGING_REQUEST_REPLY";
     private static final String REPLY_MESSAGE_TYPE = "NETTY_MESSAGING_REQUEST_REPLY";
 
 
     private Endpoint localEp;
     private Endpoint localEp;
+    private int preamble;
     private final AtomicBoolean started = new AtomicBoolean(false);
     private final AtomicBoolean started = new AtomicBoolean(false);
     private final Map<String, Consumer<InternalMessage>> handlers = new ConcurrentHashMap<>();
     private final Map<String, Consumer<InternalMessage>> handlers = new ConcurrentHashMap<>();
     private final AtomicLong messageIdGenerator = new AtomicLong(0);
     private final AtomicLong messageIdGenerator = new AtomicLong(0);
@@ -123,11 +124,12 @@ public class NettyMessaging implements MessagingService {
         clientChannelClass = NioSocketChannel.class;
         clientChannelClass = NioSocketChannel.class;
     }
     }
 
 
-    public void start(Endpoint localEp) throws Exception {
+    public void start(int preamble, Endpoint localEp) throws Exception {
         if (started.get()) {
         if (started.get()) {
             log.warn("Already running at local endpoint: {}", localEp);
             log.warn("Already running at local endpoint: {}", localEp);
             return;
             return;
         }
         }
+        this.preamble = preamble;
         this.localEp = localEp;
         this.localEp = localEp;
         channels.setLifo(true);
         channels.setLifo(true);
         channels.setTestOnBorrow(true);
         channels.setTestOnBorrow(true);
@@ -324,7 +326,7 @@ public class NettyMessaging implements MessagingService {
     private class SslServerCommunicationChannelInitializer extends ChannelInitializer<SocketChannel> {
     private class SslServerCommunicationChannelInitializer extends ChannelInitializer<SocketChannel> {
 
 
         private final ChannelHandler dispatcher = new InboundMessageDispatcher();
         private final ChannelHandler dispatcher = new InboundMessageDispatcher();
-        private final ChannelHandler encoder = new MessageEncoder();
+        private final ChannelHandler encoder = new MessageEncoder(preamble);
 
 
         @Override
         @Override
         protected void initChannel(SocketChannel channel) throws Exception {
         protected void initChannel(SocketChannel channel) throws Exception {
@@ -351,7 +353,7 @@ public class NettyMessaging implements MessagingService {
 
 
             channel.pipeline().addLast("ssl", new io.netty.handler.ssl.SslHandler(serverSslEngine))
             channel.pipeline().addLast("ssl", new io.netty.handler.ssl.SslHandler(serverSslEngine))
                     .addLast("encoder", encoder)
                     .addLast("encoder", encoder)
-                    .addLast("decoder", new MessageDecoder())
+                    .addLast("decoder", new MessageDecoder(preamble))
                     .addLast("handler", dispatcher);
                     .addLast("handler", dispatcher);
         }
         }
 
 
@@ -360,7 +362,7 @@ public class NettyMessaging implements MessagingService {
     private class SslClientCommunicationChannelInitializer extends ChannelInitializer<SocketChannel> {
     private class SslClientCommunicationChannelInitializer extends ChannelInitializer<SocketChannel> {
 
 
         private final ChannelHandler dispatcher = new InboundMessageDispatcher();
         private final ChannelHandler dispatcher = new InboundMessageDispatcher();
-        private final ChannelHandler encoder = new MessageEncoder();
+        private final ChannelHandler encoder = new MessageEncoder(preamble);
 
 
         @Override
         @Override
         protected void initChannel(SocketChannel channel) throws Exception {
         protected void initChannel(SocketChannel channel) throws Exception {
@@ -386,7 +388,7 @@ public class NettyMessaging implements MessagingService {
 
 
             channel.pipeline().addLast("ssl", new io.netty.handler.ssl.SslHandler(clientSslEngine))
             channel.pipeline().addLast("ssl", new io.netty.handler.ssl.SslHandler(clientSslEngine))
                     .addLast("encoder", encoder)
                     .addLast("encoder", encoder)
-                    .addLast("decoder", new MessageDecoder())
+                    .addLast("decoder", new MessageDecoder(preamble))
                     .addLast("handler", dispatcher);
                     .addLast("handler", dispatcher);
         }
         }
 
 
@@ -395,13 +397,13 @@ public class NettyMessaging implements MessagingService {
     private class OnosCommunicationChannelInitializer extends ChannelInitializer<SocketChannel> {
     private class OnosCommunicationChannelInitializer extends ChannelInitializer<SocketChannel> {
 
 
         private final ChannelHandler dispatcher = new InboundMessageDispatcher();
         private final ChannelHandler dispatcher = new InboundMessageDispatcher();
-        private final ChannelHandler encoder = new MessageEncoder();
+        private final ChannelHandler encoder = new MessageEncoder(preamble);
 
 
         @Override
         @Override
         protected void initChannel(SocketChannel channel) throws Exception {
         protected void initChannel(SocketChannel channel) throws Exception {
                 channel.pipeline()
                 channel.pipeline()
                         .addLast("encoder", encoder)
                         .addLast("encoder", encoder)
-                        .addLast("decoder", new MessageDecoder())
+                        .addLast("decoder", new MessageDecoder(preamble))
                         .addLast("handler", dispatcher);
                         .addLast("handler", dispatcher);
         }
         }
     }
     }
@@ -424,7 +426,6 @@ public class NettyMessaging implements MessagingService {
             context.close();
             context.close();
         }
         }
     }
     }
-
     private void dispatchLocally(InternalMessage message) throws IOException {
     private void dispatchLocally(InternalMessage message) throws IOException {
         String type = message.type();
         String type = message.type();
         if (REPLY_MESSAGE_TYPE.equals(type)) {
         if (REPLY_MESSAGE_TYPE.equals(type)) {