Making NetconfDeviceProvider try to get actual device description from device in…

… checkAndUpdateDevice()

- Getting device description only if controller is currently Master for device

Change-Id: I870b2f19fd5e09e198e2c73bcabf9869504f2c94

@@ -347,9 +347,23 @@ public class NetconfDeviceProvider extends AbstractProvider
         } else {
         } else {
             boolean isReachable = isReachable(deviceId);
             boolean isReachable = isReachable(deviceId);
             if (isReachable && !deviceService.isAvailable(deviceId)) {
             if (isReachable && !deviceService.isAvailable(deviceId)) {
+                Device device = deviceService.getDevice(deviceId);
+                DeviceDescription updatedDeviceDescription = null;
+                if (device.is(DeviceDescriptionDiscovery.class)) {
+                    if (mastershipService.isLocalMaster(deviceId)) {
+                        DeviceDescriptionDiscovery deviceDescriptionDiscovery =
+                                device.as(DeviceDescriptionDiscovery.class);
+                        updatedDeviceDescription = deviceDescriptionDiscovery.discoverDeviceDetails();
+                    }
+                } else {
+                    log.warn("No DeviceDescriptionDiscovery behaviour for device {}", deviceId);
+                }
+                if (updatedDeviceDescription == null) {
+                    updatedDeviceDescription = deviceDescription;
+                }
                 providerService.deviceConnected(
                 providerService.deviceConnected(
                         deviceId, new DefaultDeviceDescription(
                         deviceId, new DefaultDeviceDescription(
-                                deviceDescription, true, deviceDescription.annotations()));
+                                updatedDeviceDescription, true, updatedDeviceDescription.annotations()));
             } else if (!isReachable && deviceService.isAvailable(deviceId)) {
             } else if (!isReachable && deviceService.isAvailable(deviceId)) {
                 providerService.deviceDisconnected(deviceId);
                 providerService.deviceDisconnected(deviceId);
             }
             }
@@ -422,7 +436,6 @@ public class NetconfDeviceProvider extends AbstractProvider
                     device.as(DeviceDescriptionDiscovery.class);
                     device.as(DeviceDescriptionDiscovery.class);
             providerService.updatePorts(deviceId,
             providerService.updatePorts(deviceId,
                                         deviceDescriptionDiscovery.discoverPortDetails());
                                         deviceDescriptionDiscovery.discoverPortDetails());
-
         } else {
         } else {
             log.warn("No portGetter behaviour for device {}", deviceId);
             log.warn("No portGetter behaviour for device {}", deviceId);
         }
         }