commit dc59c15aeeff2be01e741dcb4ec16adc0a1d9d9e
author Pavlin Radoslavov <pavlin@onlab.us> Tue Jun 17 17:04:41 2014 -0700
committer Pavlin Radoslavov <pavlin@onlab.us> Tue Jun 17 17:04:41 2014 -0700
tree 82121aef2cf60ff33f852172011bf9a700c18a50
parent 3cc67d6885730f162f8f20efa9f87c2b145d066c

Fix a bug in the JSON string representation of a MAC address.
The MAC address should be 48-bit value.

Change-Id: Ib3f745cae97229e8c58d404635249e22537a99e2
OLD: "00:00:00:00:00:00:ff:fe"
NEW: "00:00:00:00:ff:fe"

src/main/java/net/onrc/onos/core/topology/web/serializers/ShortestPathIntentSerializer.java

diff --git a/src/main/java/net/onrc/onos/core/topology/web/serializers/ShortestPathIntentSerializer.java b/src/main/java/net/onrc/onos/core/topology/web/serializers/ShortestPathIntentSerializer.java
index f0fa00c..42f102f 100644
--- a/src/main/java/net/onrc/onos/core/topology/web/serializers/ShortestPathIntentSerializer.java
+++ b/src/main/java/net/onrc/onos/core/topology/web/serializers/ShortestPathIntentSerializer.java
@@ -2,6 +2,7 @@
 
 
 import com.google.common.net.InetAddresses;
+import net.floodlightcontroller.util.MACAddress;
 import net.onrc.onos.core.intent.ShortestPathIntent;
 import org.codehaus.jackson.JsonGenerator;
 import org.codehaus.jackson.map.SerializerProvider;
@@ -57,7 +58,7 @@
         jsonGenerator.writeStringField("srcPortNumber",
                                        Long.toString(intent.getSrcPortNumber()));
         jsonGenerator.writeStringField("srcMac",
-                                       HexString.toHexString(intent.getSrcMac()));
+                MACAddress.valueOf(intent.getSrcMac()).toString());
         jsonGenerator.writeStringField("srcIp",
                                        toIPAddressString(intent.getSrcIp()));
 
@@ -66,7 +67,7 @@
         jsonGenerator.writeStringField("dstPortNumber",
                                        Long.toString(intent.getDstPortNumber()));
         jsonGenerator.writeStringField("dstMac",
-                                       HexString.toHexString(intent.getDstMac()));
+                MACAddress.valueOf(intent.getDstMac()).toString());
         jsonGenerator.writeStringField("dstIp",
                                        toIPAddressString(intent.getDstIp()));
 

src/test/java/net/onrc/onos/api/rest/TestRestIntentHighGet.java

diff --git a/src/test/java/net/onrc/onos/api/rest/TestRestIntentHighGet.java b/src/test/java/net/onrc/onos/api/rest/TestRestIntentHighGet.java
index 97003aa..58e9bfa 100644
--- a/src/test/java/net/onrc/onos/api/rest/TestRestIntentHighGet.java
+++ b/src/test/java/net/onrc/onos/api/rest/TestRestIntentHighGet.java
@@ -185,7 +185,7 @@
         assertThat(intent, hasKey("srcPortNumber"));
         assertThat(intent.get("srcPortNumber"), is(equalTo("14")));
         assertThat(intent, hasKey("srcMac"));
-        assertThat(intent.get("srcMac"), is(equalTo("00:00:00:00:00:00:ff:fe")));
+        assertThat(intent.get("srcMac"), is(equalTo("00:00:00:00:ff:fe")));
         assertThat(intent, hasKey("srcMac"));
         assertThat(intent.get("srcIp"), is(equalTo(IP_ADDRESS_1)));
 
@@ -194,7 +194,7 @@
         assertThat(intent, hasKey("dstPortNumber"));
         assertThat(intent.get("dstPortNumber"), is(equalTo("41")));
         assertThat(intent, hasKey("dstMac"));
-        assertThat(intent.get("dstMac"), is(equalTo("00:00:00:00:00:00:ff:fe")));
+        assertThat(intent.get("dstMac"), is(equalTo("00:00:00:00:ff:fe")));
         assertThat(intent, hasKey("dstMac"));
         assertThat(intent.get("dstIp"), is(equalTo(IP_ADDRESS_2)));
     }