Merge pull request #333 from nilok/iofswitch-inet-addr

adding getInetAddress() as a function for IOFSwitch

src/main/java/net/floodlightcontroller/core/IOFSwitch.java

@@ -18,6 +18,7 @@
 package net.floodlightcontroller.core;
 
 import java.io.IOException;
+import java.net.SocketAddress;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
@@ -217,6 +218,12 @@ public interface IOFSwitch {
      */
     public String getStringId();
     
+    /**
+     * Get the IP Address for the switch
+     * @return the inet address
+     */
+    public SocketAddress getInetAddress();
+    
     /**
      * Retrieves attributes of this switch
      * @return

src/main/java/net/floodlightcontroller/core/internal/OFSwitchImpl.java

@@ -616,6 +616,7 @@ public class OFSwitchImpl implements IOFSwitch {
      * Get the IP Address for the switch
      * @return the inet address
      */
+    @Override
     @JsonSerialize(using=ToStringSerializer.class)
     public SocketAddress getInetAddress() {
         return channel.getRemoteAddress();

src/test/java/net/floodlightcontroller/util/OFMessageDamperMockSwitch.java

@@ -2,6 +2,7 @@ package net.floodlightcontroller.util;
 
 import static org.junit.Assert.*;
 import java.io.IOException;
+import java.net.SocketAddress;
 
 import java.util.Collection;
 import java.util.Date;
@@ -191,6 +192,12 @@ public class OFMessageDamperMockSwitch implements IOFSwitch {
         return null;
     }
     
+    @Override
+    public SocketAddress getInetAddress() {
+        assertTrue("Unexpected method call", false);
+        return null;
+    }
+    
     @Override
     public Map<Object, Object> getAttributes() {
         assertTrue("Unexpected method call", false);