VOL-4056 Changed wrong fsm control when aborting FSM.In case of failing omci-send-routines MibUpload FSM has to be triggered with event ulEvStop instead of event.
Change-Id: I3b3886d8ce390fdbcfe5f2b42ad1dc232f08c86a
diff --git a/internal/pkg/onuadaptercore/mib_sync.go b/internal/pkg/onuadaptercore/mib_sync.go
index 2191a75..2aa4ec1 100644
--- a/internal/pkg/onuadaptercore/mib_sync.go
+++ b/internal/pkg/onuadaptercore/mib_sync.go
@@ -105,7 +105,7 @@
pMibUlFsm := oo.pMibUploadFsm
if pMibUlFsm != nil {
go func(a_pAFsm *AdapterFsm) {
- _ = oo.pMibUploadFsm.pFsm.Event(ulEvResetMib)
+ _ = oo.pMibUploadFsm.pFsm.Event(ulEvStop)
}(pMibUlFsm)
}
return
@@ -125,7 +125,7 @@
pMibUlFsm := oo.pMibUploadFsm
if pMibUlFsm != nil {
go func(a_pAFsm *AdapterFsm) {
- _ = oo.pMibUploadFsm.pFsm.Event(ulEvResetMib)
+ _ = oo.pMibUploadFsm.pFsm.Event(ulEvStop)
}(pMibUlFsm)
}
return
@@ -145,7 +145,7 @@
pMibUlFsm := oo.pMibUploadFsm
if pMibUlFsm != nil {
go func(a_pAFsm *AdapterFsm) {
- _ = oo.pMibUploadFsm.pFsm.Event(ulEvResetMib)
+ _ = oo.pMibUploadFsm.pFsm.Event(ulEvStop)
}(pMibUlFsm)
}
return
@@ -165,7 +165,7 @@
pMibUlFsm := oo.pMibUploadFsm
if pMibUlFsm != nil {
go func(a_pAFsm *AdapterFsm) {
- _ = oo.pMibUploadFsm.pFsm.Event(ulEvResetMib)
+ _ = oo.pMibUploadFsm.pFsm.Event(ulEvStop)
}(pMibUlFsm)
}
return
@@ -185,7 +185,7 @@
pMibUlFsm := oo.pMibUploadFsm
if pMibUlFsm != nil {
go func(a_pAFsm *AdapterFsm) {
- _ = oo.pMibUploadFsm.pFsm.Event(ulEvResetMib)
+ _ = oo.pMibUploadFsm.pFsm.Event(ulEvStop)
}(pMibUlFsm)
}
return
@@ -437,7 +437,7 @@
me.OnuDataClassID, onuDataMeID, requestedAttributes, oo.pOpenOnuAc.omciTimeout, true, oo.pMibUploadFsm.commChan)
if err != nil {
logger.Errorw(ctx, "ONUData get failed, aborting MibSync", log.Fields{"device-id": oo.deviceID})
- _ = oo.pMibUploadFsm.pFsm.Event(ulEvResetMib)
+ _ = oo.pMibUploadFsm.pFsm.Event(ulEvStop)
return
}
//TODO: needs extra handling of timeouts
@@ -852,7 +852,7 @@
pMibUlFsm := oo.pMibUploadFsm
if pMibUlFsm != nil {
go func(a_pAFsm *AdapterFsm) {
- _ = oo.pMibUploadFsm.pFsm.Event(ulEvResetMib)
+ _ = oo.pMibUploadFsm.pFsm.Event(ulEvStop)
}(pMibUlFsm)
}
return