VOL-1801 : Inconsistent data update
rhp.mergeDeviceInfoFromAdapter function moved to DeviceAgent.
Geting device, merging with new values and commiting to db done in same Lock.
Change-Id: I5e72a229d00ce876ffdbbe5339feea916803f38d
diff --git a/rw_core/core/device_manager.go b/rw_core/core/device_manager.go
index d053ac4..606e36f 100755
--- a/rw_core/core/device_manager.go
+++ b/rw_core/core/device_manager.go
@@ -625,10 +625,10 @@
return nil
}
-func (dMgr *DeviceManager) updateDevice(device *voltha.Device) error {
- log.Debugw("updateDevice", log.Fields{"deviceid": device.Id, "device": device})
+func (dMgr *DeviceManager) updateDeviceUsingAdapterData(device *voltha.Device) error {
+ log.Debugw("updateDeviceUsingAdapterData", log.Fields{"deviceid": device.Id, "device": device})
if agent := dMgr.getDeviceAgent(device.Id); agent != nil {
- return agent.updateDevice(device)
+ return agent.updateDeviceUsingAdapterData(device)
}
return status.Errorf(codes.NotFound, "%s", device.Id)
}