Fixed device subsystem behaviour where auxiliary provider prevented emitting dev…

…ice availability change events.

Change-Id: Iaed6359598ff87d5706e10eb9d905ed0883617d9

@@ -383,7 +383,8 @@ public class GossipDeviceStore
         // We allow only certain attributes to trigger update
         // We allow only certain attributes to trigger update
         boolean propertiesChanged =
         boolean propertiesChanged =
                 !Objects.equals(oldDevice.hwVersion(), newDevice.hwVersion()) ||
                 !Objects.equals(oldDevice.hwVersion(), newDevice.hwVersion()) ||
-                        !Objects.equals(oldDevice.swVersion(), newDevice.swVersion());
+                        !Objects.equals(oldDevice.swVersion(), newDevice.swVersion()) ||
+                        !Objects.equals(oldDevice.providerId(), newDevice.providerId());
         boolean annotationsChanged =
         boolean annotationsChanged =
                 !AnnotationsUtil.isEqual(oldDevice.annotations(), newDevice.annotations());
                 !AnnotationsUtil.isEqual(oldDevice.annotations(), newDevice.annotations());
 
 
@@ -399,16 +400,14 @@ public class GossipDeviceStore
                         , newDevice);
                         , newDevice);
             }
             }
             if (!providerId.isAncillary()) {
             if (!providerId.isAncillary()) {
+                boolean wasOnline = availableDevices.contains(newDevice.id());
                 markOnline(newDevice.id(), newTimestamp);
                 markOnline(newDevice.id(), newTimestamp);
+                if (!wasOnline) {
+                    notifyDelegateIfNotNull(new DeviceEvent(DEVICE_AVAILABILITY_CHANGED, newDevice, null));
                 }
                 }
-            return new DeviceEvent(DeviceEvent.Type.DEVICE_UPDATED, newDevice, null);
             }
             }
 
 
-        // Otherwise merely attempt to change availability if primary provider
-        if (!providerId.isAncillary()) {
-            boolean added = markOnline(newDevice.id(), newTimestamp);
-            return !added ? null :
-                    new DeviceEvent(DEVICE_AVAILABILITY_CHANGED, newDevice, null);
+            return new DeviceEvent(DeviceEvent.Type.DEVICE_UPDATED, newDevice, null);
         }
         }
         return null;
         return null;
     }
     }

+{
+  "devices": [
+    { "alias":  "s1", "uri": "of:0000000000000001", "annotations": { "driver": "ovs-corsa" } },
+    { "alias":  "s2", "uri": "of:0000000000000002", "annotations": { "driver": "ovs-corsa" } }
+  ]
+}