[VOL-5532]:Aniconfig FSM reset map fix
Change-Id: I441e3ad80fe3b1194d9cf98b2447762a55f8bbcb
Signed-off-by: balaji.nagarajan <balaji.nagarajan@radisys.com>
diff --git a/VERSION b/VERSION
index 965a689..8bbab56 100755
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.13.4
+2.13.5
diff --git a/internal/pkg/avcfg/omci_ani_config.go b/internal/pkg/avcfg/omci_ani_config.go
index ac489da..206b96b 100755
--- a/internal/pkg/avcfg/omci_ani_config.go
+++ b/internal/pkg/avcfg/omci_ani_config.go
@@ -284,9 +284,13 @@
// CancelProcessing ensures that suspended processing at waiting on some response is aborted and reset of FSM
func (oFsm *UniPonAniConfigFsm) CancelProcessing(ctx context.Context) {
- logger.Info(ctx, "CancelProcessing entered", log.Fields{"device-id": oFsm.deviceID})
+ logger.Info(ctx, "UniPonAniConfigFsm CancelProcessing entered", log.Fields{"device-id": oFsm.deviceID})
//early indication about started reset processing
- oFsm.pUniTechProf.setProfileResetting(ctx, oFsm.pOnuUniPort.UniID, oFsm.techProfileID, true)
+ if oFsm.PAdaptFsm != nil && oFsm.PAdaptFsm.PFsm != nil {
+ if oFsm.PAdaptFsm.PFsm.Current() != aniStDisabled && oFsm.PAdaptFsm.PFsm.Current() != aniStResetting {
+ oFsm.pUniTechProf.setProfileResetting(ctx, oFsm.pOnuUniPort.UniID, oFsm.techProfileID, true)
+ }
+ }
//mutex protection is required for possible concurrent access to FSM members
oFsm.mutexIsAwaitingResponse.Lock()
oFsm.isCanceled = true