VOL-4504 removal of DEVICE_BUSY from the image failure reason in code
Change-Id: Ie539d7f2af9f131241c59c0aa0820e77a3e7d5f2
diff --git a/VERSION b/VERSION
index 76f938b..3fc585e 100755
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.2-dev261
+2.1.2-dev262
diff --git a/internal/pkg/swupg/omci_onu_upgrade.go b/internal/pkg/swupg/omci_onu_upgrade.go
index c0660b8..9f78044 100755
--- a/internal/pkg/swupg/omci_onu_upgrade.go
+++ b/internal/pkg/swupg/omci_onu_upgrade.go
@@ -185,7 +185,6 @@
volthaDownloadState voltha.ImageState_ImageDownloadState
volthaDownloadReason voltha.ImageState_ImageFailureReason
volthaImageState voltha.ImageState_ImageActivationState
- downloadReasonCached voltha.ImageState_ImageFailureReason
isEndSwDlOpen bool
chReceiveAbortEndSwDlResponse chan tEndSwDlResponseResult
}
@@ -1521,10 +1520,6 @@
//if the EndSwDl was requested from state AbortingDL then use channel to indicate ONU busy/repeat indication
oFsm.chReceiveAbortEndSwDlResponse <- cEndSwDlResponseBusy //repeat abort request
}
- oFsm.mutexUpgradeParams.Lock()
- oFsm.downloadReasonCached = oFsm.volthaDownloadReason //copy for later reconstruction
- oFsm.volthaDownloadReason = voltha.ImageState_DEVICE_BUSY
- oFsm.mutexUpgradeParams.Unlock()
return
}
if inAbortingState {
@@ -1552,9 +1547,6 @@
oFsm.mutexUpgradeParams.Lock()
if msgObj.EntityInstance == oFsm.InactiveImageMeID {
logger.Debugw(ctx, "Expected EndSwDlResponse received", log.Fields{"device-id": oFsm.deviceID})
- if oFsm.volthaDownloadReason == voltha.ImageState_DEVICE_BUSY { //was temporary on busy
- oFsm.volthaDownloadReason = oFsm.downloadReasonCached //recapture from mirror
- }
if inAbortingState {
oFsm.mutexUpgradeParams.Unlock()
//if the EndSwDl was requested from state AbortingDL then use channel to indicate abort acceptance