commit f84ea7fb57fbc53e34a9509db1344802b48024da
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Thu Dec 22 14:47:17 2016 -0800
committer Jonathan Hart <jono@onlab.us> Wed Jan 11 17:56:37 2017 +0000
tree 0d66ed81ec8cd3df58f8dce875f25c919b08e2fb
parent e113df4c1d12ab549ef71fd63bd57bf59b95daf3

Output log on a failure of resource registration

Change-Id: I9a98dc49ae0f5f265fdc3b03142181348f86ee0f

core/net/src/main/java/org/onosproject/net/resource/impl/ResourceDeviceListener.java

diff --git a/core/net/src/main/java/org/onosproject/net/resource/impl/ResourceDeviceListener.java b/core/net/src/main/java/org/onosproject/net/resource/impl/ResourceDeviceListener.java
index 4cd5245..fa31919 100644
--- a/core/net/src/main/java/org/onosproject/net/resource/impl/ResourceDeviceListener.java
+++ b/core/net/src/main/java/org/onosproject/net/resource/impl/ResourceDeviceListener.java
@@ -142,7 +142,12 @@
     }
 
     private void registerDeviceResource(Device device) {
-        executor.execute(() -> adminService.register(Resources.discrete(device.id()).resource()));
+        executor.execute(() -> {
+            boolean success = adminService.register(Resources.discrete(device.id()).resource());
+            if (!success) {
+                log.warn("Failed to register Device: {}", device.id());
+            }
+        });
     }
 
     private void unregisterDeviceResource(Device device) {
@@ -170,33 +175,45 @@
             // for VLAN IDs
             Set<VlanId> vlans = queryVlanIds(device.id(), port.number());
             if (!vlans.isEmpty()) {
-                adminService.register(vlans.stream()
+                boolean success = adminService.register(vlans.stream()
                         .map(portPath::child)
                         .collect(Collectors.toList()));
+                if (!success) {
+                    log.warn("Failed to register VLAN IDs for {}", portPath.id());
+                }
             }
 
             // for MPLS labels
             Set<MplsLabel> mplsLabels = queryMplsLabels(device.id(), port.number());
             if (!mplsLabels.isEmpty()) {
-                adminService.register(mplsLabels.stream()
+                boolean success = adminService.register(mplsLabels.stream()
                         .map(portPath::child)
                         .collect(Collectors.toList()));
+                if (!success) {
+                    log.warn("Failed to register MPLS Labels for {}", portPath.id());
+                }
             }
 
             // for Lambdas
             Set<OchSignal> lambdas = queryLambdas(device.id(), port.number());
             if (!lambdas.isEmpty()) {
-                adminService.register(lambdas.stream()
+                boolean success = adminService.register(lambdas.stream()
                         .map(portPath::child)
                         .collect(Collectors.toList()));
+                if (!success) {
+                    log.warn("Failed to register lambdas for {}", portPath.id());
+                }
             }
 
             // for Tributary slots
             Set<TributarySlot> tSlots = queryTributarySlots(device.id(), port.number());
             if (!tSlots.isEmpty()) {
-                adminService.register(tSlots.stream()
+                boolean success = adminService.register(tSlots.stream()
                         .map(portPath::child)
                         .collect(Collectors.toList()));
+                if (!success) {
+                    log.warn("Failed to register tributary slots for {}", portPath.id());
+                }
             }
         });
     }