Initial check-in for new p2p cluster messaging; to be refactored.

@@ -28,10 +28,6 @@
             <version>${project.version}</version>
             <version>${project.version}</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
-            <groupId>org.livetribe.slp</groupId>
-            <artifactId>livetribe-slp</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.karaf.shell</groupId>
             <groupId>org.apache.karaf.shell</groupId>
             <artifactId>org.apache.karaf.shell.console</artifactId>
             <artifactId>org.apache.karaf.shell.console</artifactId>
         </dependency>
         </dependency>

@@ -26,6 +26,23 @@
             <artifactId>onos-core-serializers</artifactId>
             <artifactId>onos-core-serializers</artifactId>
             <version>${project.version}</version>
             <version>${project.version}</version>
         </dependency>
         </dependency>
+
+
+        <dependency>
+            <groupId>org.onlab.onos</groupId>
+            <artifactId>onlab-nio</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
+
         <dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.annotations</artifactId>
             <artifactId>org.apache.felix.scr.annotations</artifactId>

+package org.onlab.onos.store.cluster.impl;
+
+import com.fasterxml.jackson.core.JsonEncoding;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.onlab.onos.cluster.DefaultControllerNode;
+import org.onlab.onos.cluster.NodeId;
+import org.onlab.packet.IpPrefix;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+/**
+ * Allows for reading and writing cluster definition as a JSON file.
+ */
+public class ClusterDefinitionStore {
+
+    private final File file;
+
+    /**
+     * Creates a reader/writer of the cluster definition file.
+     *
+     * @param filePath location of the definition file
+     */
+    public ClusterDefinitionStore(String filePath) {
+        file = new File(filePath);
+    }
+
+    /**
+     * Returns set of the controller nodes, including self.
+     *
+     * @return set of controller nodes
+     */
+    public Set<DefaultControllerNode> read() throws IOException {
+        Set<DefaultControllerNode> nodes = new HashSet<>();
+        ObjectMapper mapper = new ObjectMapper();
+        ObjectNode clusterNodeDef = (ObjectNode) mapper.readTree(file);
+        Iterator<JsonNode> it = ((ArrayNode) clusterNodeDef.get("nodes")).elements();
+        while (it.hasNext()) {
+            ObjectNode nodeDef = (ObjectNode) it.next();
+            nodes.add(new DefaultControllerNode(new NodeId(nodeDef.get("id").asText()),
+                                                IpPrefix.valueOf(nodeDef.get("ip").asText()),
+                                                nodeDef.get("tcpPort").asInt(9876)));
+        }
+        return nodes;
+    }
+
+    /**
+     * Writes the given set of the controller nodes.
+     *
+     * @param nodes set of controller nodes
+     */
+    public void write(Set<DefaultControllerNode> nodes) throws IOException {
+        ObjectMapper mapper = new ObjectMapper();
+        ObjectNode clusterNodeDef = mapper.createObjectNode();
+        ArrayNode nodeDefs = mapper.createArrayNode();
+        clusterNodeDef.set("nodes", nodeDefs);
+        for (DefaultControllerNode node : nodes) {
+            ObjectNode nodeDef = mapper.createObjectNode();
+            nodeDef.put("id", node.id().toString())
+                    .put("ip", node.ip().toString())
+                    .put("tcpPort", node.tcpPort());
+            nodeDefs.add(nodeDef);
+        }
+        mapper.writeTree(new JsonFactory().createGenerator(file, JsonEncoding.UTF8),
+                         clusterNodeDef);
+    }
+
+}

-package org.onlab.onos.ccc;
+package org.onlab.onos.store.cluster.impl;
 
 
 import org.onlab.nio.AbstractMessage;
 import org.onlab.nio.AbstractMessage;
 
 
@@ -12,17 +12,16 @@ import static com.google.common.base.MoreObjects.toStringHelper;
 public class TLVMessage extends AbstractMessage {
 public class TLVMessage extends AbstractMessage {
 
 
     private final int type;
     private final int type;
-    private final Object data;
+    private final byte[] data;
 
 
     /**
     /**
      * Creates an immutable TLV message.
      * Creates an immutable TLV message.
      *
      *
      * @param type   message type
      * @param type   message type
-     * @param length message length
-     * @param data   message data
+     * @param data   message data bytes
      */
      */
-    public TLVMessage(int type, int length, Object data) {
-        this.length = length;
+    public TLVMessage(int type, byte[] data) {
+        this.length = data.length + TLVMessageStream.METADATA_LENGTH;
         this.type = type;
         this.type = type;
         this.data = data;
         this.data = data;
     }
     }
@@ -37,11 +36,11 @@ public class TLVMessage extends AbstractMessage {
     }
     }
 
 
     /**
     /**
-     * Returns the data object.
+     * Returns the data bytes.
      *
      *
      * @return message data
      * @return message data
      */
      */
-    public Object data() {
+    public byte[] data() {
         return data;
         return data;
     }
     }
 
 

-package org.onlab.onos.ccc;
+package org.onlab.onos.store.cluster.impl;
 
 
 import org.onlab.nio.IOLoop;
 import org.onlab.nio.IOLoop;
 import org.onlab.nio.MessageStream;
 import org.onlab.nio.MessageStream;
+import org.onlab.onos.cluster.DefaultControllerNode;
 
 
 import java.nio.ByteBuffer;
 import java.nio.ByteBuffer;
 import java.nio.channels.ByteChannel;
 import java.nio.channels.ByteChannel;
@@ -13,8 +14,13 @@ import static com.google.common.base.Preconditions.checkState;
  */
  */
 public class TLVMessageStream extends MessageStream<TLVMessage> {
 public class TLVMessageStream extends MessageStream<TLVMessage> {
 
 
+    public static final int METADATA_LENGTH = 16; // 8 + 4 + 4
+
+    private static final int LENGTH_OFFSET = 12;
     private static final long MARKER = 0xfeedcafecafefeedL;
     private static final long MARKER = 0xfeedcafecafefeedL;
 
 
+    private DefaultControllerNode node;
+
     /**
     /**
      * Creates a message stream associated with the specified IO loop and
      * Creates a message stream associated with the specified IO loop and
      * backed by the given byte channel.
      * backed by the given byte channel.
@@ -29,17 +35,51 @@ public class TLVMessageStream extends MessageStream<TLVMessage> {
         super(loop, byteChannel, bufferSize, maxIdleMillis);
         super(loop, byteChannel, bufferSize, maxIdleMillis);
     }
     }
 
 
+    /**
+     * Returns the node with which this stream is associated.
+     *
+     * @return controller node
+     */
+    DefaultControllerNode node() {
+        return node;
+    }
+
+    /**
+     * Sets the node with which this stream is affiliated.
+     *
+     * @param node controller node
+     */
+    void setNode(DefaultControllerNode node) {
+        checkState(this.node == null, "Stream is already bound to a node");
+        this.node = node;
+    }
+
     @Override
     @Override
     protected TLVMessage read(ByteBuffer buffer) {
     protected TLVMessage read(ByteBuffer buffer) {
+        // Do we have enough bytes to read the header? If not, bail.
+        if (buffer.remaining() < METADATA_LENGTH) {
+            return null;
+        }
+
+        // Peek at the length and if we have enough to read the entire message
+        // go ahead, otherwise bail.
+        int length = buffer.getInt(buffer.position() + LENGTH_OFFSET);
+        if (buffer.remaining() < length) {
+            return null;
+        }
+
+        // At this point, we have enough data to read a complete message.
         long marker = buffer.getLong();
         long marker = buffer.getLong();
         checkState(marker == MARKER, "Incorrect message marker");
         checkState(marker == MARKER, "Incorrect message marker");
 
 
         int type = buffer.getInt();
         int type = buffer.getInt();
-        int length = buffer.getInt();
+        length = buffer.getInt();
 
 
         // TODO: add deserialization hook here
         // TODO: add deserialization hook here
+        byte[] data = new byte[length - METADATA_LENGTH];
+        buffer.get(data);
 
 
-        return new TLVMessage(type, length, null);
+        return new TLVMessage(type, data);
     }
     }
 
 
     @Override
     @Override
@@ -49,5 +89,7 @@ public class TLVMessageStream extends MessageStream<TLVMessage> {
         buffer.putInt(message.length());
         buffer.putInt(message.length());
 
 
         // TODO: add serialization hook here
         // TODO: add serialization hook here
+        buffer.put(message.data());
     }
     }
+
 }
 }

@@ -48,14 +48,11 @@
              description="ONOS core components">
              description="ONOS core components">
         <feature>onos-api</feature>
         <feature>onos-api</feature>
         <bundle>mvn:org.onlab.onos/onos-core-net/1.0.0-SNAPSHOT</bundle>
         <bundle>mvn:org.onlab.onos/onos-core-net/1.0.0-SNAPSHOT</bundle>
-        <bundle>mvn:org.onlab.onos/onos-core-hz-common/1.0.0-SNAPSHOT</bundle>
-        <bundle>mvn:org.onlab.onos/onos-core-serializers/1.0.0-SNAPSHOT</bundle>
-        <bundle>mvn:org.onlab.onos/onos-core-hz-cluster/1.0.0-SNAPSHOT</bundle>
-        <bundle>mvn:org.onlab.onos/onos-core-hz-net/1.0.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.onlab.onos/onos-core-dist/1.0.0-SNAPSHOT</bundle>
     </feature>
     </feature>
 
 
-    <feature name="onos-core-dist" version="1.0.0"
-             description="ONOS core components">
+    <feature name="onos-core-hazelcast" version="1.0.0"
+             description="ONOS core components built on hazelcast">
         <feature>onos-api</feature>
         <feature>onos-api</feature>
         <bundle>mvn:org.onlab.onos/onos-core-net/1.0.0-SNAPSHOT</bundle>
         <bundle>mvn:org.onlab.onos/onos-core-net/1.0.0-SNAPSHOT</bundle>
         <bundle>mvn:org.onlab.onos/onos-core-hz-common/1.0.0-SNAPSHOT</bundle>
         <bundle>mvn:org.onlab.onos/onos-core-hz-common/1.0.0-SNAPSHOT</bundle>

@@ -170,7 +170,7 @@ public abstract class MessageStream<M extends Message> {
     }
     }
 
 
     /**
     /**
-     * Reads, withouth blocking, a list of messages from the stream.
+     * Reads, without blocking, a list of messages from the stream.
      * The list will be empty if there were not messages pending.
      * The list will be empty if there were not messages pending.
      *
      *
      * @return list of messages or null if backing channel has been closed
      * @return list of messages or null if backing channel has been closed