commit 6bd4de011aedee5138ef77173f9eb9cf8eb507b6
author ssiddiqui <salmansiddiquimailbox@gmail.com> Tue Jun 08 12:04:17 2021 +0530
committer ssiddiqui <salmansiddiquimailbox@gmail.com> Tue Jun 08 12:04:17 2021 +0530
tree 152d422ecabb3b974e630cd11fae541b10b02d20
parent 47348f6b2dfa5d70d19c3400c1a39943f5af24b4

[VOL-4165] rwcore- wrong output for multiple ONUs

Change-Id: I18ae9957f653d3223608e760d538a4a6dd459043

rw_core/core/device/manager.go

diff --git a/rw_core/core/device/manager.go b/rw_core/core/device/manager.go
index 2c77186..9982611 100755
--- a/rw_core/core/device/manager.go
+++ b/rw_core/core/device/manager.go
@@ -1619,13 +1619,14 @@
 	ctx = utils.WithRPCMetadataContext(ctx, "DownloadImageToDevice")
 	respCh := make(chan []*voltha.DeviceImageState, len(request.GetDeviceId()))
 
-	downloadReq := &voltha.DeviceImageDownloadRequest{
-		Image:             request.Image,
-		ActivateOnSuccess: request.ActivateOnSuccess,
-		CommitOnSuccess:   request.CommitOnSuccess,
-	}
-
 	for index, deviceID := range request.DeviceId {
+		// Create download request per device
+		downloadReq := &voltha.DeviceImageDownloadRequest{
+			Image:             request.Image,
+			ActivateOnSuccess: request.ActivateOnSuccess,
+			CommitOnSuccess:   request.CommitOnSuccess,
+		}
+
 		//slice-out only single deviceID from the request
 		downloadReq.DeviceId = request.DeviceId[index : index+1]
 
@@ -1665,13 +1666,14 @@
 
 	ctx = utils.WithRPCMetadataContext(ctx, "GetImageStatus")
 
-	imageStatusReq := &voltha.DeviceImageRequest{
-		Version:         request.Version,
-		CommitOnSuccess: request.CommitOnSuccess,
-	}
-
 	respCh := make(chan []*voltha.DeviceImageState, len(request.GetDeviceId()))
 	for index, deviceID := range request.DeviceId {
+		// Create status request per device
+		imageStatusReq := &voltha.DeviceImageRequest{
+			Version:         request.Version,
+			CommitOnSuccess: request.CommitOnSuccess,
+		}
+
 		//slice-out only single deviceID from the request
 		imageStatusReq.DeviceId = request.DeviceId[index : index+1]
 
@@ -1712,12 +1714,13 @@
 	ctx = utils.WithRPCMetadataContext(ctx, "AbortImageUpgradeToDevice")
 	respCh := make(chan []*voltha.DeviceImageState, len(request.GetDeviceId()))
 
-	abortImageReq := &voltha.DeviceImageRequest{
-		Version:         request.Version,
-		CommitOnSuccess: request.CommitOnSuccess,
-	}
-
 	for index, deviceID := range request.DeviceId {
+		// Create abort request per device
+		abortImageReq := &voltha.DeviceImageRequest{
+			Version:         request.Version,
+			CommitOnSuccess: request.CommitOnSuccess,
+		}
+
 		//slice-out only single deviceID from the request
 		abortImageReq.DeviceId = request.DeviceId[index : index+1]
 
@@ -1780,12 +1783,13 @@
 	ctx = utils.WithRPCMetadataContext(ctx, "ActivateImage")
 	respCh := make(chan []*voltha.DeviceImageState, len(request.GetDeviceId()))
 
-	activateImageReq := &voltha.DeviceImageRequest{
-		Version:         request.Version,
-		CommitOnSuccess: request.CommitOnSuccess,
-	}
-
 	for index, deviceID := range request.DeviceId {
+		// Create activate request per device
+		activateImageReq := &voltha.DeviceImageRequest{
+			Version:         request.Version,
+			CommitOnSuccess: request.CommitOnSuccess,
+		}
+
 		//slice-out only single deviceID from the request
 		activateImageReq.DeviceId = request.DeviceId[index : index+1]
 
@@ -1827,12 +1831,12 @@
 	ctx = utils.WithRPCMetadataContext(ctx, "CommitImage")
 	respCh := make(chan []*voltha.DeviceImageState, len(request.GetDeviceId()))
 
-	commitImageReq := &voltha.DeviceImageRequest{
-		Version:         request.Version,
-		CommitOnSuccess: request.CommitOnSuccess,
-	}
-
 	for index, deviceID := range request.DeviceId {
+		// Create commit request per device
+		commitImageReq := &voltha.DeviceImageRequest{
+			Version:         request.Version,
+			CommitOnSuccess: request.CommitOnSuccess,
+		}
 		//slice-out only single deviceID from the request
 		commitImageReq.DeviceId = request.DeviceId[index : index+1]