Merge remote-tracking branch 'floodlight/master' into addrspace

src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java

@@ -522,7 +522,7 @@ public class LinkDiscoveryManager
 
         OFPhysicalPort physicalPort = remoteSwitch.getPort(remotePort);
         int srcPortState = (physicalPort != null) ? physicalPort.getState() : 0;
-        physicalPort = sw.getPort(remotePort);
+        physicalPort = sw.getPort(pi.getInPort());
         int dstPortState = (physicalPort != null) ? physicalPort.getState() : 0;
 
         // Store the time of update to this link, and push it out to routingEngine

src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java

@@ -1158,17 +1158,17 @@ public class ControllerTest extends FloodlightTestCase {
      */
     @Test
     public void testRemoveActiveSwitch() {
-    	IOFSwitch sw = EasyMock.createNiceMock(IOFSwitch.class);
-    	boolean exceptionThrown = false;
-    	expect(sw.getId()).andReturn(1L).anyTimes();
-    	replay(sw);
-    	getController().activeSwitches.put(sw.getId(), sw);
-    	try {
-    		getController().getSwitches().remove(1L);
-    	} catch (UnsupportedOperationException e) {
-    		exceptionThrown = true;
-    	}
-    	assertTrue(exceptionThrown);
-    	verify(sw);
+        IOFSwitch sw = EasyMock.createNiceMock(IOFSwitch.class);
+        boolean exceptionThrown = false;
+        expect(sw.getId()).andReturn(1L).anyTimes();
+        replay(sw);
+        getController().activeSwitches.put(sw.getId(), sw);
+        try {
+            getController().getSwitches().remove(1L);
+        } catch (UnsupportedOperationException e) {
+            exceptionThrown = true;
+        }
+        assertTrue(exceptionThrown);
+        verify(sw);
     }
 }