commit a90c44c0a3706cbac4df6a25b3c646f705828783
author Jon Hall <jhall@ciena.com> Tue Jan 24 16:02:07 2017 -0800
committer Jonathan Hart <jono@onlab.us> Wed Jan 25 16:57:50 2017 +0000
tree 8ced62f3aca5ecb4b0925a1c15c88345dd3e4150
parent ba5006b31e0841858d87f07eec691d59c972d3d4

Surpress excess warning messages

Don't ask for role of NONE when a device is disconnected and role is
already NONE

Change-Id: Ib86335cc17847c820c33743897ae087765271be9

core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
index a86b50d..a3dbcad 100644
--- a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
+++ b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
@@ -766,7 +766,12 @@
         final boolean isReachable = isReachable(did);
         if (!isReachable) {
             // device is not connected to this node
-            if (myNextRole != NONE) {
+            if (mastershipService.getLocalRole(did) == NONE) {
+                log.debug("Node was instructed to be {} role for {}, "
+                                + "but this node cannot reach the device "
+                                + "and role is already None. Ignoring request.",
+                        myNextRole, did);
+            } else if (myNextRole != NONE) {
                 log.warn("Node was instructed to be {} role for {}, "
                                  + "but this node cannot reach the device.  "
                                  + "Relinquishing role.  ",