commit 5c8cbebbdb21ed146b2be9f1c3b766f21f45d85f
author Yuta HIGUCHI <y-higuchi@onlab.us> Fri Jun 27 11:13:48 2014 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Wed Jul 02 14:03:37 2014 -0700
tree 6329f1e0247c7f1d065d2939fa6fdeab4c93f601
parent 8f3dfa3f7a65fdb0aceea610c7c3ede9dc903744

Remove PortEvent.SwitchPort

- JSON format of util.SwitchPort has changed to match PortEvent.SwitchPort.
  (not sure if it was currently used in public API)
- Note: SwitchPort#toString() format is different. Log messages, etc. may have changed.
   PortEvent.SwitchPort : "(dpid@number)" both decimal
   util.SwitchPort : "00:00:...:01/number" dpid as HexString, number as decimal

- Part of ONOS-1564

Change-Id: I19ea06de7a701f0f7aaae0a7ed6f0726c0133a91

src/main/java/net/onrc/onos/core/topology/LinkEvent.java

diff --git a/src/main/java/net/onrc/onos/core/topology/LinkEvent.java b/src/main/java/net/onrc/onos/core/topology/LinkEvent.java
index c54140d..f72a429 100644
--- a/src/main/java/net/onrc/onos/core/topology/LinkEvent.java
+++ b/src/main/java/net/onrc/onos/core/topology/LinkEvent.java
@@ -2,10 +2,10 @@
 
 import java.nio.ByteBuffer;
 
-import net.onrc.onos.core.topology.PortEvent.SwitchPort;
 import net.onrc.onos.core.topology.web.serializers.LinkEventSerializer;
 import net.onrc.onos.core.util.Dpid;
 import net.onrc.onos.core.util.PortNumber;
+import net.onrc.onos.core.util.SwitchPort;
 
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 
@@ -65,8 +65,8 @@
 
     public static ByteBuffer getLinkID(Dpid srcDpid, PortNumber srcPortNo,
                                        Dpid dstDpid, PortNumber dstPortNo) {
-            return getLinkID(srcDpid.value(), (long) srcPortNo.value(),
-                             dstDpid.value(), (long) dstPortNo.value());
+        return getLinkID(srcDpid.value(), (long) srcPortNo.value(),
+                         dstDpid.value(), (long) dstPortNo.value());
     }
 
     public static ByteBuffer getLinkID(Long srcDpid, Long srcPortNo,
@@ -77,8 +77,7 @@
     }
 
     public byte[] getID() {
-        return getLinkID(src.getDpid(), src.getNumber(),
-                dst.getDpid(), dst.getNumber()).array();
+        return getIDasByteBuffer().array();
     }
 
     public ByteBuffer getIDasByteBuffer() {