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/packetservice/PacketModule.java b/src/main/java/net/onrc/onos/core/packetservice/PacketModule.java
index 2bed639..9a03fed 100644
--- a/src/main/java/net/onrc/onos/core/packetservice/PacketModule.java
+++ b/src/main/java/net/onrc/onos/core/packetservice/PacketModule.java
@@ -26,6 +26,8 @@
import net.onrc.onos.core.topology.Port;
import net.onrc.onos.core.topology.Switch;
import net.onrc.onos.core.topology.Topology;
+import net.onrc.onos.core.util.Dpid;
+import net.onrc.onos.core.util.PortNumber;
import net.onrc.onos.core.util.SwitchPort;
import org.openflow.protocol.OFMessage;
@@ -161,10 +163,11 @@
Switch topologySwitch;
Port inPort;
+ final Dpid dpid = new Dpid(sw.getId());
+ topology.acquireReadLock();
try {
- topology.acquireReadLock();
- topologySwitch = topology.getSwitch(sw.getId());
- inPort = topology.getPort(sw.getId(), (long) pi.getInPort());
+ topologySwitch = topology.getSwitch(dpid);
+ inPort = topology.getPort(dpid, new PortNumber(pi.getInPort()));
} finally {
topology.releaseReadLock();
}