commit 1c1f0c2c59d1cdc617a5d15a68d388f30c6dc59a
author jaegonkim <jaegon77.kim@samsung.com> Sun Jan 28 22:20:42 2018 +0900
committer Thomas Vachuska <tom@opennetworking.org> Thu Feb 15 22:37:25 2018 +0000
tree fc713b5cece01179d718336a2504fef5093f9640
parent 307ca97aba7bb3786036de90a924985984b5a482

[ONOS-7410] DeviceManager.deviceConnected does not apply device annotations

Change-Id: Iafaa4bdc717d19052660ccf1c7455494ff95d22f

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 f499d1b..068c676 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
@@ -530,6 +530,11 @@
             PortDescriptionsConfig portConfig = networkConfigService.getConfig(deviceId, PortDescriptionsConfig.class);
             // Generate updated description and establish my Role
             deviceDescription = BasicDeviceOperator.combine(cfg, deviceDescription);
+            DeviceAnnotationConfig annoConfig = networkConfigService.getConfig(deviceId, DeviceAnnotationConfig.class);
+            if (annoConfig != null) {
+                deviceDescription = deviceAnnotationOp.combine(deviceId, deviceDescription, Optional.of(annoConfig));
+            }
+
             Futures.getUnchecked(mastershipService.requestRoleFor(deviceId)
                                          .thenAccept(role -> {
                                              log.info("Local role is {} for {}", role, deviceId);