Merge into master from pull request #1514: Add RARP ethertype...

Merge into master from pull request #1514: Add RARP ethertype (https://github.com/bigswitch/bigswitchcontroller/pull/1514)

src/main/java/net/floodlightcontroller/linkdiscovery/ILinkDiscovery.java

 package net.floodlightcontroller.linkdiscovery;
 
+import org.codehaus.jackson.map.annotate.JsonSerialize;
+import org.codehaus.jackson.map.ser.ToStringSerializer;
+import org.openflow.util.HexString;
+
 public interface ILinkDiscovery {
 
-    public static enum UpdateOperation {LINK_UPDATED, LINK_REMOVED, SWITCH_UPDATED, SWITCH_REMOVED, PORT_UP, PORT_DOWN};
+    @JsonSerialize(using=ToStringSerializer.class)
+    public enum UpdateOperation {
+        LINK_UPDATED("Link Updated"),
+        LINK_REMOVED("Link Removed"),
+        SWITCH_UPDATED("Switch Updated"),
+        SWITCH_REMOVED("Switch Removed"),
+        PORT_UP("Port Up"),
+        PORT_DOWN("Port Down");
+        
+        private String value;
+        UpdateOperation(String v) {
+            value = v;
+        }
+        
+        @Override
+        public String toString() {
+            return value;
+        }
+    }
 
     public class LDUpdate {
         protected long src;
@@ -83,36 +105,25 @@ public interface ILinkDiscovery {
         
         @Override
         public String toString() {
-            String operationString = null;
-            if (operation == UpdateOperation.LINK_REMOVED) {
-                operationString = "Link Removed";
-                return "LDUpdate [operation=" + operationString +
-                        ", src=" + src + ", srcPort=" + srcPort
-                        + ", dst=" + dst + ", dstPort=" + dstPort
-                        + ", type=" + type + "]";
-            } else if (operation == UpdateOperation.LINK_UPDATED) {
-                operationString = "Link Updated";
-                return "LDUpdate [operation=" + operationString +
-                        ", src=" + src + ", srcPort=" + srcPort
-                        + ", dst=" + dst + ", dstPort=" + dstPort
+            switch (operation) {
+            case LINK_REMOVED:
+            case LINK_UPDATED:
+                return "LDUpdate [operation=" + operation +
+                        ", src=" + HexString.toHexString(src)
+                        + ", srcPort=" + srcPort
+                        + ", dst=" + HexString.toHexString(dst) 
+                        + ", dstPort=" + dstPort
                         + ", type=" + type + "]";
-            } else if (operation == UpdateOperation.PORT_DOWN) {
-                operationString = "Port Down";
-                return "LDUpdate [operation=" + operationString +
-                        ", src=" + src + ", srcPort=" + srcPort + "]";
-            } else if (operation == UpdateOperation.PORT_UP) {
-                operationString = "Port Up";
-                return "LDUpdate [operation=" + operationString +
-                        ", src=" + src + ", srcPort=" + srcPort + "]";
-            } else if (operation == UpdateOperation.SWITCH_REMOVED) {
-                operationString = "Switch Removed";
-                return "LDUpdate [operation=" + operationString +
-                        ", src=" + src + "]";
-            } else if (operation == UpdateOperation.SWITCH_UPDATED) {
-                operationString = "Switch Updated";
-                return "LDUpdate [operation=" + operationString +
-                        ", src=" + src + "]";
-            } else {
+            case PORT_DOWN:
+            case PORT_UP:
+                return "LDUpdate [operation=" + operation +
+                        ", src=" + HexString.toHexString(src)
+                        + ", srcPort=" + srcPort + "]";
+            case SWITCH_REMOVED:
+            case SWITCH_UPDATED:
+                return "LDUpdate [operation=" + operation +
+                        ", src=" + HexString.toHexString(src) + "]";
+            default:
                 return "LDUpdate: Unknown update.";
             }
         }

src/main/java/net/floodlightcontroller/packet/Ethernet.java

@@ -32,6 +32,7 @@ import org.openflow.util.HexString;
 public class Ethernet extends BasePacket {
     private static String HEXES = "0123456789ABCDEF";
     public static final short TYPE_ARP = 0x0806;
+    public static final short TYPE_RARP = (short) 0x8035;
     public static final short TYPE_IPv4 = 0x0800;
     public static final short TYPE_LLDP = (short) 0x88cc;
     public static final short TYPE_BSN = (short) 0x8942;
@@ -43,6 +44,7 @@ public class Ethernet extends BasePacket {
     static {
         etherTypeClassMap = new HashMap<Short, Class<? extends IPacket>>();
         etherTypeClassMap.put(TYPE_ARP, ARP.class);
+        etherTypeClassMap.put(TYPE_RARP, ARP.class);
         etherTypeClassMap.put(TYPE_IPv4, IPv4.class);
         etherTypeClassMap.put(TYPE_LLDP, LLDP.class);
         etherTypeClassMap.put(TYPE_BDDP, BDDP.class);