Remove IP addresses from the Port interface.
Addresses are now indirectly associated with Ports.
diff --git a/core/store/src/main/java/org/onlab/onos/store/device/impl/DefaultPortSerializer.java b/core/store/src/main/java/org/onlab/onos/store/device/impl/DefaultPortSerializer.java
index bd0aa06..25122f6 100644
--- a/core/store/src/main/java/org/onlab/onos/store/device/impl/DefaultPortSerializer.java
+++ b/core/store/src/main/java/org/onlab/onos/store/device/impl/DefaultPortSerializer.java
@@ -1,19 +1,13 @@
package org.onlab.onos.store.device.impl;
-import java.util.ArrayList;
-import java.util.Collection;
-
import org.onlab.onos.net.DefaultPort;
import org.onlab.onos.net.Element;
import org.onlab.onos.net.PortNumber;
-import org.onlab.packet.IpPrefix;
import com.esotericsoftware.kryo.Kryo;
import com.esotericsoftware.kryo.Serializer;
import com.esotericsoftware.kryo.io.Input;
import com.esotericsoftware.kryo.io.Output;
-import com.esotericsoftware.kryo.serializers.CollectionSerializer;
-import com.google.common.collect.ImmutableSet;
// TODO move to util, etc.
/**
@@ -22,10 +16,6 @@
public final class DefaultPortSerializer extends
Serializer<DefaultPort> {
- private final CollectionSerializer ipAddrSerializer
- = new CollectionSerializer(IpPrefix.class,
- new IpPrefixSerializer(), false);
-
/**
* Default constructor.
*/
@@ -39,8 +29,6 @@
kryo.writeClassAndObject(output, object.element());
kryo.writeObject(output, object.number());
output.writeBoolean(object.isEnabled());
- kryo.writeObject(output, object.ipAddresses(),
- ipAddrSerializer);
}
@Override
@@ -49,11 +37,7 @@
Element element = (Element) kryo.readClassAndObject(input);
PortNumber number = kryo.readObject(input, PortNumber.class);
boolean isEnabled = input.readBoolean();
- @SuppressWarnings("unchecked")
- Collection<IpPrefix> ipAddresses = kryo.readObject(
- input, ArrayList.class, ipAddrSerializer);
- return new DefaultPort(element, number, isEnabled,
- ImmutableSet.copyOf(ipAddresses));
+ return new DefaultPort(element, number, isEnabled);
}
}