Add some additional unit tests and change error status to null from NONE. ...

Add some additional unit tests and change error status to null from NONE.  Some minor serializer cleanup

src/main/java/net/floodlightcontroller/devicemanager/SwitchPort.java

@@ -17,6 +17,8 @@
 
 package net.floodlightcontroller.devicemanager;
 
+import net.floodlightcontroller.core.web.serializers.DPIDSerializer;
+
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 import org.codehaus.jackson.map.ser.ToStringSerializer;
 
@@ -28,7 +30,6 @@ import org.codehaus.jackson.map.ser.ToStringSerializer;
 public class SwitchPort {
     @JsonSerialize(using=ToStringSerializer.class)
     public enum ErrorStatus {
-        NONE("none"),
         DUPLICATE_DEVICE("duplicate-device");
         
         private String value;
@@ -47,7 +48,7 @@ public class SwitchPort {
                     return m;
                 }
             }
-            return ErrorStatus.NONE;
+            return null;
         }
     }
     
@@ -77,19 +78,22 @@ public class SwitchPort {
         super();
         this.switchDPID = switchDPID;
         this.port = port;
-        this.errorStatus = ErrorStatus.NONE;
+        this.errorStatus = null;
     }
     
     // ***************
     // Getters/Setters
     // ***************
 
+    @JsonSerialize(using=DPIDSerializer.class)
     public long getSwitchDPID() {
         return switchDPID;
     }
+    
     public int getPort() {
         return port;
     }
+    
     public ErrorStatus getErrorStatus() {
         return errorStatus;
     }

src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java

@@ -985,20 +985,20 @@ public class DeviceManagerImpl implements
         if (changedFields.size() == 0) return changedFields;
         
         for (Entity entity : device.getEntities()) {
-            if (newEntity.getIpv4Address() != null &&
-                entity.getIpv4Address() != null &&
-                entity.getIpv4Address().equals(newEntity.getIpv4Address()))
+            if (newEntity.getIpv4Address() == null ||
+                (entity.getIpv4Address() != null &&
+                 entity.getIpv4Address().equals(newEntity.getIpv4Address())))
                 changedFields.remove(DeviceField.IPV4);
-            if (newEntity.getVlan() != null &&
-                entity.getVlan() != null &&
-                entity.getVlan().equals(newEntity.getVlan()))
+            if (newEntity.getVlan() == null ||
+                (entity.getVlan() != null &&
+                 entity.getVlan().equals(newEntity.getVlan())))
                 changedFields.remove(DeviceField.VLAN);
-            if (newEntity.getSwitchDPID() != null &&
-                entity.getSwitchDPID() != null &&
-                newEntity.getSwitchPort() != null &&
-                entity.getSwitchPort() != null &&
-                entity.getSwitchDPID().equals(newEntity.getSwitchDPID()) &&
-                entity.getSwitchPort().equals(newEntity.getSwitchPort()))
+            if (newEntity.getSwitchDPID() == null ||
+                newEntity.getSwitchPort() == null ||
+                (entity.getSwitchDPID() != null &&
+                 entity.getSwitchPort() != null &&
+                 entity.getSwitchDPID().equals(newEntity.getSwitchDPID()) &&
+                 entity.getSwitchPort().equals(newEntity.getSwitchPort())))
                 changedFields.remove(DeviceField.SWITCH);            
         }
         

src/main/java/net/floodlightcontroller/devicemanager/web/DeviceSerializer.java

@@ -56,13 +56,7 @@ public class DeviceSerializer extends JsonSerializer<Device> {
         jGen.writeEndArray();
         jGen.writeArrayFieldStart("attachmentPoint");
         for (SwitchPort ap : device.getAttachmentPoints(true)) {
-            jGen.writeStartObject();
-            jGen.writeStringField("dpid", 
-                                  HexString.toHexString(ap.getSwitchDPID(), 8));
-            jGen.writeNumberField("port", ap.getPort());
-            jGen.writeStringField("errorStatus",
-                                  ap.getErrorStatus().toString());
-            jGen.writeEndObject();
+            serializer.defaultSerializeValue(ap, jGen);
         }
         jGen.writeEndArray();
 

src/test/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImplTest.java

@@ -237,6 +237,26 @@ public class DeviceManagerImplTest extends FloodlightTestCase {
         
     }
     
+    @Test
+    public void testLastSeen() throws Exception {    
+        Calendar c = Calendar.getInstance();
+        Date d1 = c.getTime();
+        Entity entity1 = new Entity(1L, null, null, null, null, d1);
+        c.add(Calendar.SECOND, 1);
+        Entity entity2 = new Entity(1L, null, 1, null, null, c.getTime());
+        
+        IDevice d = deviceManager.learnDeviceByEntity(entity2);
+        assertEquals(c.getTime(), d.getLastSeen());
+        d = deviceManager.learnDeviceByEntity(entity1);
+        assertEquals(c.getTime(), d.getLastSeen());
+        
+        deviceManager.startUp(null);
+        d = deviceManager.learnDeviceByEntity(entity1);
+        assertEquals(d1, d.getLastSeen());
+        d = deviceManager.learnDeviceByEntity(entity2);
+        assertEquals(c.getTime(), d.getLastSeen());
+    }
+    
     @Test
     public void testEntityLearning() throws Exception {
         IDeviceListener mockListener = 
@@ -262,6 +282,7 @@ public class DeviceManagerImplTest extends FloodlightTestCase {
         Entity entity4 = new Entity(1L, null, 1, 1L, 1, new Date());
         Entity entity5 = new Entity(2L, (short)4, 1, 5L, 2, new Date());
         Entity entity6 = new Entity(2L, (short)4, 1, 50L, 3, new Date());
+        Entity entity7 = new Entity(2L, (short)4, 2, 50L, 3, new Date());
 
         mockListener.deviceAdded(isA(IDevice.class));
         replay(mockListener, mockTopology);
@@ -271,6 +292,8 @@ public class DeviceManagerImplTest extends FloodlightTestCase {
         assertSame(d1, deviceManager.findDeviceByEntity(entity1));
         assertArrayEquals(new IEntityClass[]{ DefaultEntityClassifier.entityClass }, 
                           d1.entityClasses);
+        assertArrayEquals(new Short[] { -1 }, d1.getVlanId());
+        assertArrayEquals(new Integer[] { }, d1.getIPv4Addresses());
 
         assertEquals(1, deviceManager.getAllDevices().size());
         verify(mockListener);
@@ -284,6 +307,8 @@ public class DeviceManagerImplTest extends FloodlightTestCase {
         assertNotSame(d1, d2);
         assertArrayEquals(new IEntityClass[]{ testEC }, 
                           d2.entityClasses);
+        assertArrayEquals(new Short[] { -1 }, d2.getVlanId());
+        assertArrayEquals(new Integer[] { }, d2.getIPv4Addresses());
 
         assertEquals(2, deviceManager.getAllDevices().size());
         verify(mockListener);
@@ -302,6 +327,8 @@ public class DeviceManagerImplTest extends FloodlightTestCase {
                           d3.getAttachmentPoints());
         assertArrayEquals(new SwitchPort[] { new SwitchPort(10L, 1) },
                           d3.getAttachmentPoints(true));
+        assertArrayEquals(new Short[] { -1 },
+                          d3.getVlanId());
 
         assertEquals(2, deviceManager.getAllDevices().size());
         verify(mockListener);
@@ -318,6 +345,8 @@ public class DeviceManagerImplTest extends FloodlightTestCase {
                           d4.getIPv4Addresses());
         assertArrayEquals(new SwitchPort[] { new SwitchPort(1L, 1) },
                           d4.getAttachmentPoints());
+        assertArrayEquals(new Short[] { -1 },
+                          d4.getVlanId());
         
         assertEquals(2, deviceManager.getAllDevices().size());
         verify(mockListener);
@@ -347,6 +376,19 @@ public class DeviceManagerImplTest extends FloodlightTestCase {
 
         assertEquals(4, deviceManager.getAllDevices().size());
         verify(mockListener);
+
+        reset(mockListener);
+        mockListener.deviceIPV4AddrChanged(isA(IDevice.class));
+        replay(mockListener);
+
+        Device d7 = deviceManager.learnDeviceByEntity(entity7);
+        assertArrayEquals(new SwitchPort[] { new SwitchPort(50L, 3) },
+                          d7.getAttachmentPoints());
+        assertArrayEquals(new Short[] { (short) 4 },
+                          d7.getVlanId());
+
+        assertEquals(4, deviceManager.getAllDevices().size());
+        verify(mockListener);
     }
     
     @Test
@@ -377,6 +419,7 @@ public class DeviceManagerImplTest extends FloodlightTestCase {
         
         Calendar c = Calendar.getInstance();
         Entity entity1 = new Entity(1L, null, 1, 1L, 1, c.getTime());
+        Entity entity0 = new Entity(1L, null, null, null, null, c.getTime());
         c.add(Calendar.SECOND, 1);
         Entity entity2 = new Entity(1L, null, null, 5L, 1, c.getTime());
         c.add(Calendar.SECOND, 1);
@@ -391,7 +434,8 @@ public class DeviceManagerImplTest extends FloodlightTestCase {
         mockListener.deviceAdded(isA(IDevice.class));
         replay(mockListener);
 
-        d = deviceManager.learnDeviceByEntity(entity1);
+        deviceManager.learnDeviceByEntity(entity1);
+        d = deviceManager.learnDeviceByEntity(entity0);
         assertEquals(1, deviceManager.getAllDevices().size());
         aps = d.getAttachmentPoints(); 
         assertArrayEquals(new SwitchPort[] { new SwitchPort(1L, 1) }, aps);