Merge pull request #990 from weichou1229/issue-987

fix: Fix device service update failed when startup
edgexfoundry · Jun 25, 2021 · 785b4de · 785b4de
2 parents 5b9873f + 5669c30
commit 785b4de
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/pkg/service/manageddevices.go b/pkg/service/manageddevices.go
@@ -100,6 +100,7 @@ func (s *DeviceService) UpdateDevice(device models.Device) error {
 
 	s.LoggingClient.Debugf("Updating managed Device %s", device.Name)
 	req := requests.NewUpdateDeviceRequest(dtos.FromDeviceModelToUpdateDTO(device))
+	req.Device.Id = nil
 	ctx := context.WithValue(context.Background(), common.CorrelationHeader, uuid.NewString())
 	_, err := s.edgexClients.DeviceClient.Update(ctx, []requests.UpdateDeviceRequest{req})
 	if err != nil {

diff --git a/pkg/service/managedwatchers.go b/pkg/service/managedwatchers.go
@@ -97,6 +97,7 @@ func (s *DeviceService) UpdateProvisionWatcher(watcher models.ProvisionWatcher)
 
 	s.LoggingClient.Debugf("Updating managed ProvisionWatcher: %s", watcher.Name)
 	req := requests.NewUpdateProvisionWatcherRequest(dtos.FromProvisionWatcherModelToUpdateDTO(watcher))
+	req.ProvisionWatcher.Id = nil
 	ctx := context.WithValue(context.Background(), common.CorrelationHeader, uuid.NewString())
 	_, err := s.edgexClients.ProvisionWatcherClient.Update(ctx, []requests.UpdateProvisionWatcherRequest{req})
 	if err != nil {

diff --git a/pkg/service/service.go b/pkg/service/service.go
@@ -215,6 +215,7 @@ func (s *DeviceService) selfRegister() errors.EdgeX {
 	} else {
 		s.LoggingClient.Infof("device service %s exists, updating it", s.ServiceName)
 		req := requests.NewUpdateDeviceServiceRequest(dtos.FromDeviceServiceModelToUpdateDTO(localDeviceService))
+		req.Service.Id = nil
 		_, err = s.edgexClients.DeviceServiceClient.Update(ctx, []requests.UpdateDeviceServiceRequest{req})
 		if err != nil {
 			s.LoggingClient.Errorf("failed to update device service %s with local config: %v", localDeviceService.Name, err)