From 2fcfde9f0d50575a86f9ca7b19ef5db9bd8384da Mon Sep 17 00:00:00 2001
From: Yuta HIGUCHI <y-higuchi@onlab.us>
Date: Mon, 20 Oct 2014 18:37:14 -0700
Subject: [PATCH] Register FlowId to Kryo

Change-Id: Ic6bff17cff78f8b95350a97e89782e9c6ae8ce7e
---
 .../org/onlab/onos/store/serializers/KryoNamespaces.java    | 4 +++-
 .../onlab/onos/store/serializers/KryoSerializerTest.java    | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/KryoNamespaces.java b/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/KryoNamespaces.java
index 7c4cac55e9..38214d3e44 100644
--- a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/KryoNamespaces.java
+++ b/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/KryoNamespaces.java
@@ -26,6 +26,7 @@ import org.onlab.onos.net.PortNumber;
 import org.onlab.onos.net.device.DefaultDeviceDescription;
 import org.onlab.onos.net.device.DefaultPortDescription;
 import org.onlab.onos.net.flow.DefaultFlowRule;
+import org.onlab.onos.net.flow.FlowId;
 import org.onlab.onos.net.host.DefaultHostDescription;
 import org.onlab.onos.net.host.HostDescription;
 import org.onlab.onos.net.link.DefaultLinkDescription;
@@ -86,7 +87,8 @@ public final class KryoNamespaces {
                     HostId.class,
                     HostDescription.class,
                     DefaultHostDescription.class,
-                    DefaultFlowRule.class
+                    DefaultFlowRule.class,
+                    FlowId.class
                     )
             .register(URI.class, new URISerializer())
             .register(NodeId.class, new NodeIdSerializer())
diff --git a/core/store/serializers/src/test/java/org/onlab/onos/store/serializers/KryoSerializerTest.java b/core/store/serializers/src/test/java/org/onlab/onos/store/serializers/KryoSerializerTest.java
index ac427cce2a..f76513d8c9 100644
--- a/core/store/serializers/src/test/java/org/onlab/onos/store/serializers/KryoSerializerTest.java
+++ b/core/store/serializers/src/test/java/org/onlab/onos/store/serializers/KryoSerializerTest.java
@@ -25,6 +25,7 @@ import org.onlab.onos.net.Link;
 import org.onlab.onos.net.LinkKey;
 import org.onlab.onos.net.PortNumber;
 import org.onlab.onos.net.SparseAnnotations;
+import org.onlab.onos.net.flow.FlowId;
 import org.onlab.onos.net.provider.ProviderId;
 import org.onlab.packet.ChassisId;
 import org.onlab.packet.IpAddress;
@@ -191,6 +192,11 @@ public class KryoSerializerTest {
         testSerialized(new HostLocation(CP1, 1234L));
     }
 
+    @Test
+    public void testFlowId() {
+        testSerialized(FlowId.valueOf(0x12345678L));
+    }
+
     @Test
     public void testAnnotations() {
         // Annotations does not have equals defined, manually test equality