Move ID byte[] generation code to Event object
Change-Id: Iaf8812d8fa8d99f085dd4d4217a8ab6454608c2a
diff --git a/src/main/java/net/onrc/onos/datastore/topology/RCLink.java b/src/main/java/net/onrc/onos/datastore/topology/RCLink.java
index caf446d..9ce8857 100644
--- a/src/main/java/net/onrc/onos/datastore/topology/RCLink.java
+++ b/src/main/java/net/onrc/onos/datastore/topology/RCLink.java
@@ -15,6 +15,8 @@
import edu.stanford.ramcloud.JRamCloud;
import net.onrc.onos.datastore.RCObject;
import net.onrc.onos.datastore.RCTable;
+import net.onrc.onos.ofcontroller.networkgraph.LinkEvent;
+import net.onrc.onos.ofcontroller.networkgraph.PortEvent;
public class RCLink extends RCObject {
@SuppressWarnings("unused")
@@ -77,13 +79,10 @@
private final SwitchPort dst;
private STATUS status;
- public static final int LINKID_BYTES = 2 + RCPort.PORTID_BYTES * 2;
-
public static byte[] getLinkID(Long src_dpid, Long src_port_no,
Long dst_dpid, Long dst_port_no) {
- return ByteBuffer.allocate(LINKID_BYTES).putChar('L')
- .put(RCPort.getPortID(src_dpid, src_port_no))
- .put(RCPort.getPortID(dst_dpid, dst_port_no)).array();
+ return LinkEvent.getLinkID(src_dpid, src_port_no, dst_dpid,
+ dst_port_no);
}
public static StringBuilder keysToSB(Collection<byte[]> keys) {
@@ -118,7 +117,7 @@
throw new IllegalArgumentException("Invalid Link key");
}
long src_port_pair[] = RCPort.getPortPairFromKey(keyBuf.slice());
- keyBuf.position(2 + RCPort.PORTID_BYTES);
+ keyBuf.position(2 + PortEvent.PORTID_BYTES);
long dst_port_pair[] = RCPort.getPortPairFromKey(keyBuf.slice());
tuple[0] = src_port_pair[0];