Topology interface to use Dpid, PortNumber
- Modified Switch interface to use Dpid, PortNumber instead of Long
- Modified Port interface to use Dpid, PortNumber instead of Long
- Modified Topology interface which uses Dpid, PortNumber, SwitchPort
- PortImpl#toString() format has changed: "%d:%d" -> "Dpid#toString():PortNumber#toString"
- Part of ONOS-1564
Change-Id: I8decdbb2fb0cce9e087ad49af3a087b65b8511d7
diff --git a/src/main/java/net/onrc/onos/core/topology/web/serializers/DeviceSerializer.java b/src/main/java/net/onrc/onos/core/topology/web/serializers/DeviceSerializer.java
index 61a8fd9..5319adf 100644
--- a/src/main/java/net/onrc/onos/core/topology/web/serializers/DeviceSerializer.java
+++ b/src/main/java/net/onrc/onos/core/topology/web/serializers/DeviceSerializer.java
@@ -8,7 +8,6 @@
import org.codehaus.jackson.JsonGenerator;
import org.codehaus.jackson.map.SerializerProvider;
import org.codehaus.jackson.map.ser.std.SerializerBase;
-import org.openflow.util.HexString;
public class DeviceSerializer extends SerializerBase<Device> {
@@ -25,8 +24,9 @@
jsonGenerator.writeStartArray();
for (Port port : dev.getAttachmentPoints()) {
jsonGenerator.writeStartObject();
- jsonGenerator.writeStringField("dpid", HexString.toHexString(port.getDpid()));
- jsonGenerator.writeNumberField("port", port.getNumber());
+ jsonGenerator.writeStringField("dpid", port.getDpid().toString());
+ // XXX Should port number be treated as unsigned?
+ jsonGenerator.writeNumberField("port", port.getNumber().value());
jsonGenerator.writeEndObject();
}
jsonGenerator.writeEndArray();