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/SwitchImpl.java b/src/main/java/net/onrc/onos/core/topology/SwitchImpl.java
index 415b924..4952c6f 100644
--- a/src/main/java/net/onrc/onos/core/topology/SwitchImpl.java
+++ b/src/main/java/net/onrc/onos/core/topology/SwitchImpl.java
@@ -1,6 +1,7 @@
package net.onrc.onos.core.topology;
import net.onrc.onos.core.util.Dpid;
+import net.onrc.onos.core.util.PortNumber;
import java.util.ArrayList;
import java.util.Collection;
@@ -25,7 +26,7 @@
private Dpid dpid;
// These needs to be ConcurrentCollecton if allowing the topology to be
// accessed concurrently
- private final Map<Long, Port> ports;
+ private final Map<PortNumber, Port> ports;
public SwitchImpl(Topology topology, Long dpid) {
this(topology, new Dpid(dpid));
@@ -34,12 +35,12 @@
public SwitchImpl(Topology topology, Dpid dpid) {
super(topology);
this.dpid = dpid;
- ports = new HashMap<Long, Port>();
+ ports = new HashMap<>();
}
@Override
- public Long getDpid() {
- return dpid.value();
+ public Dpid getDpid() {
+ return dpid;
}
@Override
@@ -48,7 +49,7 @@
}
@Override
- public Port getPort(Long number) {
+ public Port getPort(PortNumber number) {
return ports.get(number);
}
@@ -66,7 +67,7 @@
}
@Override
- public Link getLinkToNeighbor(Long neighborDpid) {
+ public Link getLinkToNeighbor(Dpid neighborDpid) {
for (Link link : getOutgoingLinks()) {
if (link.getDstSwitch().getDpid().equals(neighborDpid)) {
return link;