Added Kryo serializers for Ip4Address, Ip6Address, Ip4Prefix, Ip6Prefix

Change-Id: Ib014bbe40b3df5c778e2d16d7b65b1cb62944e1c

+/*
+ * Copyright 2014 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onlab.onos.store.serializers;
+
+import org.onlab.packet.Ip4Address;
+import com.esotericsoftware.kryo.Kryo;
+import com.esotericsoftware.kryo.Serializer;
+import com.esotericsoftware.kryo.io.Input;
+import com.esotericsoftware.kryo.io.Output;
+
+/**
+ * Kryo Serializer for {@link Ip4Address}.
+ */
+public class Ip4AddressSerializer extends Serializer<Ip4Address> {
+
+    /**
+     * Creates {@link Ip4Address} serializer instance.
+     */
+    public Ip4AddressSerializer() {
+        // non-null, immutable
+        super(false, true);
+    }
+
+    @Override
+    public void write(Kryo kryo, Output output, Ip4Address object) {
+        byte[] octs = object.toOctets();
+        // TODO: Writing (and reading) the number of octets is redundant:
+        // It is always Ip4Address.BYTE_LENGTH
+        output.writeInt(octs.length);
+        output.writeBytes(octs);
+    }
+
+    @Override
+    public Ip4Address read(Kryo kryo, Input input, Class<Ip4Address> type) {
+        final int octLen = input.readInt();
+        byte[] octs = new byte[octLen];
+        input.readBytes(octs);
+        return Ip4Address.valueOf(octs);
+    }
+}

+/*
+ * Copyright 2014 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onlab.onos.store.serializers;
+
+import org.onlab.packet.Ip4Prefix;
+
+import com.esotericsoftware.kryo.Kryo;
+import com.esotericsoftware.kryo.Serializer;
+import com.esotericsoftware.kryo.io.Input;
+import com.esotericsoftware.kryo.io.Output;
+
+/**
+ * Kryo Serializer for {@link Ip4Prefix}.
+ */
+public final class Ip4PrefixSerializer extends Serializer<Ip4Prefix> {
+
+    /**
+     * Creates {@link Ip4Prefix} serializer instance.
+     */
+    public Ip4PrefixSerializer() {
+        // non-null, immutable
+        super(false, true);
+    }
+
+    @Override
+    public void write(Kryo kryo, Output output,
+            Ip4Prefix object) {
+        byte[] octs = object.address().toOctets();
+        // TODO: Writing (and reading) the number of octets is redundant:
+        // It is always Ip6Address.BYTE_LENGTH
+        output.writeInt(octs.length);
+        output.writeBytes(octs);
+        output.writeInt(object.prefixLength());
+    }
+
+    @Override
+    public Ip4Prefix read(Kryo kryo, Input input,
+            Class<Ip4Prefix> type) {
+        int octLen = input.readInt();
+        byte[] octs = new byte[octLen];
+        input.readBytes(octs);
+        int prefLen = input.readInt();
+        return Ip4Prefix.valueOf(octs, prefLen);
+    }
+}

+/*
+ * Copyright 2014 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onlab.onos.store.serializers;
+
+import org.onlab.packet.Ip6Address;
+import com.esotericsoftware.kryo.Kryo;
+import com.esotericsoftware.kryo.Serializer;
+import com.esotericsoftware.kryo.io.Input;
+import com.esotericsoftware.kryo.io.Output;
+
+/**
+ * Kryo Serializer for {@link Ip6Address}.
+ */
+public class Ip6AddressSerializer extends Serializer<Ip6Address> {
+
+    /**
+     * Creates {@link Ip6Address} serializer instance.
+     */
+    public Ip6AddressSerializer() {
+        // non-null, immutable
+        super(false, true);
+    }
+
+    @Override
+    public void write(Kryo kryo, Output output, Ip6Address object) {
+        byte[] octs = object.toOctets();
+        // TODO: Writing (and reading) the number of octets is redundant:
+        // It is always Ip6Address.BYTE_LENGTH
+        output.writeInt(octs.length);
+        output.writeBytes(octs);
+    }
+
+    @Override
+    public Ip6Address read(Kryo kryo, Input input, Class<Ip6Address> type) {
+        final int octLen = input.readInt();
+        byte[] octs = new byte[octLen];
+        input.readBytes(octs);
+        return Ip6Address.valueOf(octs);
+    }
+}

+/*
+ * Copyright 2014 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onlab.onos.store.serializers;
+
+import org.onlab.packet.Ip6Prefix;
+
+import com.esotericsoftware.kryo.Kryo;
+import com.esotericsoftware.kryo.Serializer;
+import com.esotericsoftware.kryo.io.Input;
+import com.esotericsoftware.kryo.io.Output;
+
+/**
+ * Kryo Serializer for {@link Ip6Prefix}.
+ */
+public final class Ip6PrefixSerializer extends Serializer<Ip6Prefix> {
+
+    /**
+     * Creates {@link Ip6Prefix} serializer instance.
+     */
+    public Ip6PrefixSerializer() {
+        // non-null, immutable
+        super(false, true);
+    }
+
+    @Override
+    public void write(Kryo kryo, Output output,
+            Ip6Prefix object) {
+        byte[] octs = object.address().toOctets();
+        // TODO: Writing (and reading) the number of octets is redundant:
+        // It is always Ip6Address.BYTE_LENGTH
+        output.writeInt(octs.length);
+        output.writeBytes(octs);
+        output.writeInt(object.prefixLength());
+    }
+
+    @Override
+    public Ip6Prefix read(Kryo kryo, Input input,
+            Class<Ip6Prefix> type) {
+        int octLen = input.readInt();
+        byte[] octs = new byte[octLen];
+        input.readBytes(octs);
+        int prefLen = input.readInt();
+        return Ip6Prefix.valueOf(octs, prefLen);
+    }
+}

@@ -88,7 +88,11 @@ import org.onlab.onos.net.resource.LinkResourceRequest;
 import org.onlab.onos.store.Timestamp;
 import org.onlab.onos.store.Timestamp;
 import org.onlab.packet.ChassisId;
 import org.onlab.packet.ChassisId;
 import org.onlab.packet.IpAddress;
 import org.onlab.packet.IpAddress;
+import org.onlab.packet.Ip4Address;
+import org.onlab.packet.Ip6Address;
 import org.onlab.packet.IpPrefix;
 import org.onlab.packet.IpPrefix;
+import org.onlab.packet.Ip4Prefix;
+import org.onlab.packet.Ip6Prefix;
 import org.onlab.packet.MacAddress;
 import org.onlab.packet.MacAddress;
 import org.onlab.packet.VlanId;
 import org.onlab.packet.VlanId;
 import org.onlab.util.KryoNamespace;
 import org.onlab.util.KryoNamespace;
@@ -104,7 +108,11 @@ public final class KryoNamespaces {
      */
      */
     public static final KryoNamespace MISC = KryoNamespace.newBuilder()
     public static final KryoNamespace MISC = KryoNamespace.newBuilder()
             .register(IpPrefix.class, new IpPrefixSerializer())
             .register(IpPrefix.class, new IpPrefixSerializer())
+            .register(Ip4Prefix.class, new Ip4PrefixSerializer())
+            .register(Ip6Prefix.class, new Ip6PrefixSerializer())
             .register(IpAddress.class, new IpAddressSerializer())
             .register(IpAddress.class, new IpAddressSerializer())
+            .register(Ip4Address.class, new Ip4AddressSerializer())
+            .register(Ip6Address.class, new Ip6AddressSerializer())
             .register(MacAddress.class, new MacAddressSerializer())
             .register(MacAddress.class, new MacAddressSerializer())
             .register(VlanId.class)
             .register(VlanId.class)
             .build();
             .build();

@@ -43,7 +43,11 @@ import org.onlab.onos.net.flow.FlowId;
 import org.onlab.onos.net.provider.ProviderId;
 import org.onlab.onos.net.provider.ProviderId;
 import org.onlab.packet.ChassisId;
 import org.onlab.packet.ChassisId;
 import org.onlab.packet.IpAddress;
 import org.onlab.packet.IpAddress;
+import org.onlab.packet.Ip4Address;
+import org.onlab.packet.Ip6Address;
 import org.onlab.packet.IpPrefix;
 import org.onlab.packet.IpPrefix;
+import org.onlab.packet.Ip4Prefix;
+import org.onlab.packet.Ip6Prefix;
 import org.onlab.packet.MacAddress;
 import org.onlab.packet.MacAddress;
 import org.onlab.util.KryoNamespace;
 import org.onlab.util.KryoNamespace;
 
 
@@ -168,11 +172,31 @@ public class KryoSerializerTest {
     }
     }
 
 
     @Test
     @Test
+    public void testIp4Prefix() {
+        testSerialized(Ip4Prefix.valueOf("192.168.0.1/24"));
+    }
+
+    @Test
+    public void testIp6Prefix() {
+        testSerialized(Ip6Prefix.valueOf("1111:2222::/120"));
+    }
+
+    @Test
     public void testIpAddress() {
     public void testIpAddress() {
         testSerialized(IpAddress.valueOf("192.168.0.1"));
         testSerialized(IpAddress.valueOf("192.168.0.1"));
     }
     }
 
 
     @Test
     @Test
+    public void testIp4Address() {
+        testSerialized(Ip4Address.valueOf("192.168.0.1"));
+    }
+
+    @Test
+    public void testIp6Address() {
+        testSerialized(Ip6Address.valueOf("1111:2222::"));
+    }
+
+    @Test
     public void testMacAddress() {
     public void testMacAddress() {
         testSerialized(MacAddress.valueOf("12:34:56:78:90:ab"));
         testSerialized(MacAddress.valueOf("12:34:56:78:90:ab"));
     }
     }