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/PortSerializer.java b/src/main/java/net/onrc/onos/core/topology/web/serializers/PortSerializer.java
index 156d2c0..52fbe44 100644
--- a/src/main/java/net/onrc/onos/core/topology/web/serializers/PortSerializer.java
+++ b/src/main/java/net/onrc/onos/core/topology/web/serializers/PortSerializer.java
@@ -7,7 +7,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 PortSerializer extends SerializerBase<Port> {
@@ -21,8 +20,8 @@
throws IOException {
jsonGenerator.writeStartObject();
jsonGenerator.writeStringField("state", "ACTIVE");
- jsonGenerator.writeStringField("dpid", HexString.toHexString(port.getDpid()));
- jsonGenerator.writeNumberField("number", port.getNumber());
+ jsonGenerator.writeStringField("dpid", port.getDpid().toString());
+ jsonGenerator.writeNumberField("number", port.getNumber().value());
jsonGenerator.writeStringField("desc", port.getDescription());
jsonGenerator.writeEndObject();
}