VOL-4504 removal of DEVICE_BUSY from the image failure reason in code
Change-Id: I53e0319ce96ccf3373bfa4f7050a1317280ff659
diff --git a/VERSION b/VERSION
index 9181bf7..4fc01ac 100755
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.3.18
+1.3.19
diff --git a/internal/pkg/onuadaptercore/omci_onu_upgrade.go b/internal/pkg/onuadaptercore/omci_onu_upgrade.go
index 657c857..736e5cd 100644
--- a/internal/pkg/onuadaptercore/omci_onu_upgrade.go
+++ b/internal/pkg/onuadaptercore/omci_onu_upgrade.go
@@ -182,7 +182,6 @@
volthaDownloadState voltha.ImageState_ImageDownloadState
volthaDownloadReason voltha.ImageState_ImageFailureReason
volthaImageState voltha.ImageState_ImageActivationState
- downloadReasonCached voltha.ImageState_ImageFailureReason
isEndSwDlOpen bool
chReceiveAbortEndSwDlResponse chan tEndSwDlResponseResult
}
@@ -1499,10 +1498,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
}
logger.Errorw(ctx, "OnuUpgradeFsm EndSwDlResponse result error - later: drive FSM to abort state ?",
@@ -1517,9 +1512,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