Add API in DeviceClock*Service to check if Timestamp can be issued.

- check local DeviceClockProviderService before trying to
  store Port update information.

Change-Id: I22c94cb712d7001a227497b723780b6db3fbdf04

@@ -25,6 +25,14 @@ import org.onlab.onos.net.DeviceId;
 public interface DeviceClockProviderService {
 public interface DeviceClockProviderService {
 
 
     /**
     /**
+     * Checks if this service can issue Timestamp for specified device.
+     *
+     * @param deviceId device identifier.
+     * @return true if timestamp can be issued for specified device
+     */
+    public boolean isTimestampAvailable(DeviceId deviceId);
+
+    /**
      * Updates the mastership term for the specified deviceId.
      * Updates the mastership term for the specified deviceId.
      *
      *
      * @param deviceId device identifier.
      * @param deviceId device identifier.

@@ -24,7 +24,16 @@ import org.onlab.onos.store.Timestamp;
 public interface DeviceClockService {
 public interface DeviceClockService {
 
 
     /**
     /**
+     * Checks if this service can issue Timestamp for specified device.
+     *
+     * @param deviceId device identifier.
+     * @return true if timestamp can be issued for specified device
+     */
+    public boolean isTimestampAvailable(DeviceId deviceId);
+
+    /**
      * Returns a new timestamp for the specified deviceId.
      * Returns a new timestamp for the specified deviceId.
+     *
      * @param deviceId device identifier.
      * @param deviceId device identifier.
      * @return timestamp.
      * @return timestamp.
      */
      */

@@ -343,6 +343,13 @@ public class DeviceManager
                          "Port descriptions list cannot be null");
                          "Port descriptions list cannot be null");
             checkValidity();
             checkValidity();
 
 
+            if (!deviceClockProviderService.isTimestampAvailable(deviceId)) {
+                // Never been a master for this device
+                // any update will be ignored.
+                log.trace("Ignoring {} port updates on standby node. {}", deviceId, portDescriptions);
+                return;
+            }
+
             List<DeviceEvent> events = store.updatePorts(this.provider().id(),
             List<DeviceEvent> events = store.updatePorts(this.provider().id(),
                                                          deviceId, portDescriptions);
                                                          deviceId, portDescriptions);
             for (DeviceEvent event : events) {
             for (DeviceEvent event : events) {
@@ -357,6 +364,13 @@ public class DeviceManager
             checkNotNull(portDescription, PORT_DESCRIPTION_NULL);
             checkNotNull(portDescription, PORT_DESCRIPTION_NULL);
             checkValidity();
             checkValidity();
 
 
+            if (!deviceClockProviderService.isTimestampAvailable(deviceId)) {
+                // Never been a master for this device
+                // any update will be ignored.
+                log.trace("Ignoring {} port update on standby node. {}", deviceId, portDescription);
+                return;
+            }
+
             final DeviceEvent event = store.updatePortStatus(this.provider().id(),
             final DeviceEvent event = store.updatePortStatus(this.provider().id(),
                                                              deviceId, portDescription);
                                                              deviceId, portDescription);
             if (event != null) {
             if (event != null) {

@@ -19,7 +19,6 @@ import com.google.common.collect.Sets;
 
 
 import org.junit.After;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.Test;
 import org.onlab.onos.cluster.ClusterEventListener;
 import org.onlab.onos.cluster.ClusterEventListener;
 import org.onlab.onos.cluster.ClusterService;
 import org.onlab.onos.cluster.ClusterService;
@@ -181,16 +180,6 @@ public class DeviceManagerTest {
         assertEquals("incorrect role", MastershipRole.MASTER, service.getRole(DID1));
         assertEquals("incorrect role", MastershipRole.MASTER, service.getRole(DID1));
     }
     }
 
 
-    @Ignore("disabled until we settle the device-mastership wiring")
-    @Test
-    public void setRole() throws InterruptedException {
-        connectDevice(DID1, SW1);
-        validateEvents(DEVICE_ADDED, DEVICE_MASTERSHIP_CHANGED);
-        assertEquals("incorrect role", MastershipRole.STANDBY, service.getRole(DID1));
-        assertEquals("incorrect device", DID1, provider.deviceReceived.id());
-        assertEquals("incorrect role", MastershipRole.STANDBY, provider.roleReceived);
-    }
-
     @Test
     @Test
     public void updatePorts() {
     public void updatePorts() {
         connectDevice(DID1, SW1);
         connectDevice(DID1, SW1);
@@ -360,9 +349,16 @@ public class DeviceManagerTest {
     private final class TestClockProviderService implements
     private final class TestClockProviderService implements
             DeviceClockProviderService {
             DeviceClockProviderService {
 
 
+        private Set<DeviceId> registerdBefore = Sets.newConcurrentHashSet();
+
         @Override
         @Override
         public void setMastershipTerm(DeviceId deviceId, MastershipTerm term) {
         public void setMastershipTerm(DeviceId deviceId, MastershipTerm term) {
-            // TODO Auto-generated method stub
+            registerdBefore.add(deviceId);
+        }
+
+        @Override
+        public boolean isTimestampAvailable(DeviceId deviceId) {
+            return registerdBefore.contains(deviceId);
         }
         }
     }
     }
 }
 }

@@ -72,4 +72,9 @@ public class DeviceClockManager implements DeviceClockService, DeviceClockProvid
         log.info("adding term info {} {}", deviceId, term.master());
         log.info("adding term info {} {}", deviceId, term.master());
         deviceMastershipTerms.put(deviceId, term);
         deviceMastershipTerms.put(deviceId, term);
     }
     }
+
+    @Override
+    public boolean isTimestampAvailable(DeviceId deviceId) {
+        return deviceMastershipTerms.containsKey(deviceId);
+    }
 }
 }

@@ -15,13 +15,16 @@
  */
  */
 package org.onlab.onos.store.trivial.impl;
 package org.onlab.onos.store.trivial.impl;
 
 
+import java.util.Set;
+
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Service;
 import org.apache.felix.scr.annotations.Service;
 import org.onlab.onos.mastership.MastershipTerm;
 import org.onlab.onos.mastership.MastershipTerm;
 import org.onlab.onos.net.DeviceId;
 import org.onlab.onos.net.DeviceId;
 import org.onlab.onos.net.device.DeviceClockProviderService;
 import org.onlab.onos.net.device.DeviceClockProviderService;
 
 
-//FIXME: Code clone in onos-core-trivial, onos-core-hz-net
+import com.google.common.collect.Sets;
+
 /**
 /**
  * Dummy implementation of {@link DeviceClockProviderService}.
  * Dummy implementation of {@link DeviceClockProviderService}.
  */
  */
@@ -29,7 +32,15 @@ import org.onlab.onos.net.device.DeviceClockProviderService;
 @Service
 @Service
 public class NoOpClockProviderService implements DeviceClockProviderService {
 public class NoOpClockProviderService implements DeviceClockProviderService {
 
 
+    private Set<DeviceId> registerdBefore = Sets.newConcurrentHashSet();
+
     @Override
     @Override
     public void setMastershipTerm(DeviceId deviceId, MastershipTerm term) {
     public void setMastershipTerm(DeviceId deviceId, MastershipTerm term) {
+        registerdBefore.add(deviceId);
+    }
+
+    @Override
+    public boolean isTimestampAvailable(DeviceId deviceId) {
+        return registerdBefore.contains(deviceId);
     }
     }
 }
 }