| commit | f381fc74b548dbcb46baea034c4897a63e81512c | [log] [tgz] |
|---|---|---|
| author | Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> | Tue Jan 03 10:39:36 2017 -0800 |
| committer | Thomas Vachuska <tom@onlab.us> | Tue Jan 03 19:04:08 2017 +0000 |
| tree | 4bbc4e8c2e97ede3e20a468143864906a243b255 | |
| parent | 41208103c08aacb84a917a7292e1f920424091b1 [diff] |
Fix DeviceDescription comparison. - It was comparing URI against DeviceId Change-Id: I9af565d66fd24b6c5eb140da088f237b4d50eac5
diff --git a/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java b/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java index ffef6dd..c04e23e 100644 --- a/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java +++ b/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java
@@ -375,7 +375,7 @@ } private boolean descriptionEquals(Device device, DeviceDescription updatedDeviceDescription) { - return Objects.equal(device.id(), updatedDeviceDescription.deviceUri()) + return Objects.equal(device.id().uri(), updatedDeviceDescription.deviceUri()) && Objects.equal(device.type(), updatedDeviceDescription.type()) && Objects.equal(device.manufacturer(), updatedDeviceDescription.manufacturer()) && Objects.equal(device.hwVersion(), updatedDeviceDescription.hwVersion())