(VOL-4994)Changing a few log levels so that bug fixing is easier
Change-Id: I052d7f4646891b2221d0d4fc923d4c181a9f6103
diff --git a/VERSION b/VERSION
index 8bbb6e4..c6436a8 100755
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.10.1
+2.10.2
diff --git a/internal/pkg/avcfg/omci_ani_config.go b/internal/pkg/avcfg/omci_ani_config.go
index 3e7be63..2e73349 100755
--- a/internal/pkg/avcfg/omci_ani_config.go
+++ b/internal/pkg/avcfg/omci_ani_config.go
@@ -280,7 +280,7 @@
//CancelProcessing ensures that suspended processing at waiting on some response is aborted and reset of FSM
func (oFsm *UniPonAniConfigFsm) CancelProcessing(ctx context.Context) {
- logger.Debugw(ctx, "CancelProcessing entered", log.Fields{"device-id": oFsm.deviceID})
+ logger.Info(ctx, "CancelProcessing entered", log.Fields{"device-id": oFsm.deviceID})
//early indication about started reset processing
oFsm.pUniTechProf.setProfileResetting(ctx, oFsm.pOnuUniPort.UniID, oFsm.techProfileID, true)
//mutex protection is required for possible concurrent access to FSM members
@@ -470,7 +470,7 @@
}
func (oFsm *UniPonAniConfigFsm) enterConfigStartingState(ctx context.Context, e *fsm.Event) {
- logger.Debugw(ctx, "UniPonAniConfigFsm start", log.Fields{
+ logger.Info(ctx, "UniPonAniConfigFsm start", log.Fields{
"device-id": oFsm.deviceID, "uni-id": oFsm.pOnuUniPort.UniID})
// in case the used channel is not yet defined (can be re-used after restarts)
if oFsm.omciMIdsResponseReceived == nil {
@@ -534,7 +534,7 @@
}
func (oFsm *UniPonAniConfigFsm) enterCreatingMBPCD(ctx context.Context, e *fsm.Event) {
- logger.Debugw(ctx, "UniPonAniConfigFsm Tx Create::MBPCD", log.Fields{
+ logger.Info(ctx, "Creating Tx MAC Bridge Port Config Data", log.Fields{
"EntitytId": strconv.FormatInt(int64(oFsm.macBPCD0ID), 16),
"TPPtr": strconv.FormatInt(int64(oFsm.mapperSP0ID), 16),
"device-id": oFsm.deviceID, "uni-id": oFsm.pOnuUniPort.UniID})
@@ -574,7 +574,7 @@
}
func (oFsm *UniPonAniConfigFsm) enterSettingTconts(ctx context.Context, e *fsm.Event) {
- logger.Debugw(ctx, "UniPonAniConfigFsm Tx Set::Tcont", log.Fields{
+ logger.Info(ctx, "Tx Setting Tcont ", log.Fields{
"EntitytId": strconv.FormatInt(int64(oFsm.tcont0ID), 16),
"AllocId": strconv.FormatInt(int64(oFsm.alloc0ID), 16),
"device-id": oFsm.deviceID, "uni-id": oFsm.pOnuUniPort.UniID,
@@ -620,30 +620,30 @@
}
func (oFsm *UniPonAniConfigFsm) enterCreatingGemNCTPs(ctx context.Context, e *fsm.Event) {
- logger.Debugw(ctx, "UniPonAniConfigFsm - start creating GemNWCtp loop", log.Fields{
+ logger.Info(ctx, "UniPonAniConfigFsm - start creating GemNWCtp loop", log.Fields{
"device-id": oFsm.deviceID, "uni-id": oFsm.pOnuUniPort.UniID})
go oFsm.performCreatingGemNCTPs(ctx)
}
func (oFsm *UniPonAniConfigFsm) enterCreatingGemIWs(ctx context.Context, e *fsm.Event) {
- logger.Debugw(ctx, "UniPonAniConfigFsm - start creating GemIwTP loop", log.Fields{
+ logger.Info(ctx, "UniPonAniConfigFsm - start creating GemIwTP loop", log.Fields{
"device-id": oFsm.deviceID, "uni-id": oFsm.pOnuUniPort.UniID})
go oFsm.performCreatingGemIWs(ctx)
}
func (oFsm *UniPonAniConfigFsm) enterSettingPQs(ctx context.Context, e *fsm.Event) {
- logger.Debugw(ctx, "UniPonAniConfigFsm - start setting PrioQueue loop", log.Fields{
+ logger.Info(ctx, "UniPonAniConfigFsm - start setting PrioQueue loop", log.Fields{
"in state": e.FSM.Current(), "device-id": oFsm.deviceID})
go oFsm.performSettingPQs(ctx)
}
func (oFsm *UniPonAniConfigFsm) enterSettingDot1PMapper(ctx context.Context, e *fsm.Event) {
- logger.Debugw(ctx, "UniPonAniConfigFsm Tx Set::.1pMapper with all PBits set", log.Fields{"EntitytId": 0x8042, /*cmp above*/
+ logger.Info(ctx, "UniPonAniConfigFsm Tx Set::.1pMapper with all PBits set", log.Fields{"EntitytId": 0x8042, /*cmp above*/
"toGemIw": 1024, /* cmp above */
"device-id": oFsm.deviceID, "uni-id": oFsm.pOnuUniPort.UniID})
- logger.Debugw(ctx, "UniPonAniConfigFsm Tx Set::1pMapper", log.Fields{
+ logger.Info(ctx, "UniPonAniConfigFsm Tx Set::1pMapper", log.Fields{
"EntitytId": strconv.FormatInt(int64(oFsm.mapperSP0ID), 16),
"in state": e.FSM.Current(), "device-id": oFsm.deviceID})
@@ -711,7 +711,7 @@
meParams.Attributes[me.Ieee8021PMapperServiceProfile_TpPointer] = 0xffff
if !foundIwPtr {
- logger.Debugw(ctx, "UniPonAniConfigFsm no GemIwPtr found for .1pMapper - abort", log.Fields{
+ logger.Warn(ctx, "UniPonAniConfigFsm no GemIwPtr found for .1pMapper - abort", log.Fields{
"device-id": oFsm.deviceID})
//TODO With multicast is possible that no upstream gem ports are not present in the tech profile,
// this reset needs to be performed only if the tech profile provides upstream gem ports but no priority is set
@@ -762,7 +762,7 @@
}
func (oFsm *UniPonAniConfigFsm) enterAniConfigDone(ctx context.Context, e *fsm.Event) {
- logger.Debugw(ctx, "UniPonAniConfigFsm ani config done", log.Fields{
+ logger.Info(ctx, "UniPonAniConfigFsm ani config done", log.Fields{
"device-id": oFsm.deviceID, "uni-id": oFsm.pOnuUniPort.UniID, "techProfile-id": oFsm.techProfileID})
//store that the UNI related techProfile processing is done for the given Profile and Uni
oFsm.pUniTechProf.setConfigDone(oFsm.pOnuUniPort.UniID, oFsm.techProfileID, true)
@@ -929,7 +929,7 @@
oFsm.pUniTechProf.mutexTPState.RLock()
loGemPortID := (*(oFsm.pUniTechProf.mapRemoveGemEntry[oFsm.uniTpKey])).gemPortID
oFsm.pUniTechProf.mutexTPState.RUnlock()
- logger.Debugw(ctx, "UniPonAniConfigFsm - start removing one GemNCTP", log.Fields{
+ logger.Info(ctx, "UniPonAniConfigFsm - start removing one GemNCTP", log.Fields{
"device-id": oFsm.deviceID, "uni-id": oFsm.pOnuUniPort.UniID,
"GemNCTP-entity-id": loGemPortID})
// this state entry is only expected in a suitable state (checked outside in onu_uni_tp)
@@ -964,7 +964,7 @@
oFsm.pUniTechProf.mutexTPState.RLock()
loGemPortID := (*(oFsm.pUniTechProf.mapRemoveGemEntry[oFsm.uniTpKey])).gemPortID
oFsm.pUniTechProf.mutexTPState.RUnlock()
- logger.Debugw(ctx, "UniPonAniConfigFsm - start removing Traffic Descriptor", log.Fields{
+ logger.Info(ctx, "UniPonAniConfigFsm - start removing Traffic Descriptor", log.Fields{
"device-id": oFsm.deviceID, "uni-id": oFsm.pOnuUniPort.UniID,
"TD-entity-id": loGemPortID})
@@ -992,7 +992,7 @@
}
func (oFsm *UniPonAniConfigFsm) enterResettingTcont(ctx context.Context, e *fsm.Event) {
- logger.Debugw(ctx, "UniPonAniConfigFsm - start resetting the TCont", log.Fields{
+ logger.Info(ctx, "UniPonAniConfigFsm - start resetting the TCont", log.Fields{
"device-id": oFsm.deviceID, "uni-id": oFsm.pOnuUniPort.UniID})
oFsm.requestEventOffset = 1 //offset 1 for last remove activity
@@ -1027,7 +1027,7 @@
}
func (oFsm *UniPonAniConfigFsm) enterRemoving1pMapper(ctx context.Context, e *fsm.Event) {
- logger.Debugw(ctx, "UniPonAniConfigFsm - start deleting the .1pMapper", log.Fields{
+ logger.Info(ctx, "UniPonAniConfigFsm - start deleting the .1pMapper", log.Fields{
"device-id": oFsm.deviceID, "uni-id": oFsm.pOnuUniPort.UniID})
mapGemPortParams := oFsm.pUniTechProf.mapPonAniConfig[oFsm.uniTpKey].mapGemPortParams
unicastGemCount := 0
@@ -1077,7 +1077,7 @@
}
func (oFsm *UniPonAniConfigFsm) enterRemovingAniBPCD(ctx context.Context, e *fsm.Event) {
- logger.Debugw(ctx, "UniPonAniConfigFsm - start deleting the ANI MBCD", log.Fields{
+ logger.Info(ctx, "UniPonAniConfigFsm - start deleting the ANI MBCD", log.Fields{
"device-id": oFsm.deviceID, "uni-id": oFsm.pOnuUniPort.UniID})
oFsm.mutexPLastTxMeInstance.Lock()
@@ -1103,7 +1103,7 @@
}
func (oFsm *UniPonAniConfigFsm) enterAniRemoveDone(ctx context.Context, e *fsm.Event) {
- logger.Debugw(ctx, "UniPonAniConfigFsm ani removal done", log.Fields{
+ logger.Info(ctx, "UniPonAniConfigFsm ani removal done", log.Fields{
"device-id": oFsm.deviceID, "uni-id": oFsm.pOnuUniPort.UniID})
//use DeviceHandler event notification directly
oFsm.pDeviceHandler.DeviceProcStatusUpdate(ctx, cmn.OnuDeviceEvent((uint8(oFsm.requestEvent) + oFsm.requestEventOffset)))
@@ -1175,7 +1175,7 @@
}
func (oFsm *UniPonAniConfigFsm) processOmciAniMessages(ctx context.Context) {
- logger.Debugw(ctx, "Start UniPonAniConfigFsm Msg processing", log.Fields{"for device-id": oFsm.deviceID})
+ logger.Info(ctx, "Start UniPonAniConfigFsm Msg processing", log.Fields{"for device-id": oFsm.deviceID})
loop:
for {
// case <-ctx.Done():
@@ -1183,7 +1183,7 @@
// break loop
message, ok := <-oFsm.PAdaptFsm.CommChan
if !ok {
- logger.Info(ctx, "UniPonAniConfigFsm Rx Msg - could not read from channel", log.Fields{"device-id": oFsm.deviceID})
+ logger.Warn(ctx, "UniPonAniConfigFsm Rx Msg - could not read from channel", log.Fields{"device-id": oFsm.deviceID})
// but then we have to ensure a restart of the FSM as well - as exceptional procedure
_ = oFsm.PAdaptFsm.PFsm.Event(aniEvReset)
break loop
@@ -1468,7 +1468,7 @@
func (oFsm *UniPonAniConfigFsm) performCreatingGemNCTPs(ctx context.Context) {
// for all GemPorts of this T-Cont as given by the size of set gemPortAttribsSlice
for gemIndex, gemPortAttribs := range oFsm.gemPortAttribsSlice {
- logger.Debugw(ctx, "UniPonAniConfigFsm Tx Create::GemNWCtp", log.Fields{
+ logger.Info(ctx, "UniPonAniConfigFsm Tx Create::GemNWCtp", log.Fields{
"EntitytId": strconv.FormatInt(int64(gemPortAttribs.gemPortID), 16),
"TcontId": strconv.FormatInt(int64(oFsm.tcont0ID), 16),
"device-id": oFsm.deviceID})
@@ -1533,7 +1533,7 @@
func (oFsm *UniPonAniConfigFsm) performCreatingGemIWs(ctx context.Context) {
// for all GemPorts of this T-Cont as given by the size of set gemPortAttribsSlice
for gemIndex, gemPortAttribs := range oFsm.gemPortAttribsSlice {
- logger.Debugw(ctx, "UniPonAniConfigFsm Tx Create::GemIwTp", log.Fields{
+ logger.Info(ctx, "UniPonAniConfigFsm Tx Create::GemIwTp", log.Fields{
"EntitytId": strconv.FormatInt(int64(gemPortAttribs.gemPortID), 16),
"SPPtr": strconv.FormatInt(int64(oFsm.mapperSP0ID), 16),
"device-id": oFsm.deviceID})
@@ -1850,7 +1850,7 @@
// PrepareForGarbageCollection - remove references to prepare for garbage collection
func (oFsm *UniPonAniConfigFsm) PrepareForGarbageCollection(ctx context.Context, aDeviceID string) {
- logger.Debugw(ctx, "prepare for garbage collection", log.Fields{"device-id": oFsm.deviceID})
+ logger.Info(ctx, "prepare for garbage collection", log.Fields{"device-id": oFsm.deviceID})
oFsm.pDeviceHandler = nil
oFsm.pOnuDeviceEntry = nil
oFsm.pOmciCC = nil
diff --git a/internal/pkg/avcfg/onu_uni_tp.go b/internal/pkg/avcfg/onu_uni_tp.go
index f3c49d7..767997b 100755
--- a/internal/pkg/avcfg/onu_uni_tp.go
+++ b/internal/pkg/avcfg/onu_uni_tp.go
@@ -178,7 +178,7 @@
func (onuTP *OnuUniTechProf) ConfigureUniTp(ctx context.Context,
aUniID uint8, aPathString string, tpInst tech_profile.TechProfileInstance, wg *sync.WaitGroup) {
defer wg.Done() //always decrement the waitGroup on return
- logger.Debugw(ctx, "configure the Uni according to TpPath", log.Fields{
+ logger.Info(ctx, "configure the Uni according to TpPath", log.Fields{
"device-id": onuTP.deviceID, "uni-id": aUniID, "path": aPathString})
tpID, err := cmn.GetTpIDFromTpPath(aPathString)
uniTpKey := uniTP{uniID: aUniID, tpID: tpID}
@@ -831,7 +831,7 @@
// createAniConfigFsm initializes and runs the AniConfig FSM to transfer the OMCI related commands for ANI side configuration
func (onuTP *OnuUniTechProf) createAniConfigFsm(ctx context.Context, aUniID uint8, aTpID uint8,
apCurrentUniPort *cmn.OnuUniPort, devEvent cmn.OnuDeviceEvent, aProcessingStep uint8) error {
- logger.Debugw(ctx, "createAniConfigFsm", log.Fields{"device-id": onuTP.deviceID})
+ logger.Info(ctx, "createAniConfigFsm", log.Fields{"device-id": onuTP.deviceID})
chAniConfigFsm := make(chan cmn.Message, 2048)
uniTPKey := uniTP{uniID: aUniID, tpID: aTpID}
if onuTP.onuDevice == nil {
@@ -857,6 +857,8 @@
/* Uni related ANI config procedure -
***** should run via 'aniConfigDone' state and generate the argument requested event *****
*/
+ logger.Info(ctx, "Run AniConfigFSM with", log.Fields{
+ "ProcessingStep": aProcessingStep, "device-id": onuTP.deviceID, "UniId": aUniID, "TpID": aTpID, "event": aEvent})
uniTpKey := uniTP{uniID: aUniID, tpID: aTpID}
pACStatemachine := onuTP.PAniConfigFsm[uniTpKey].PAdaptFsm.PFsm
diff --git a/internal/pkg/common/omci_cc.go b/internal/pkg/common/omci_cc.go
index 6cb15b7..24286d0 100755
--- a/internal/pkg/common/omci_cc.go
+++ b/internal/pkg/common/omci_cc.go
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-//Package common provides global definitions
+// Package common provides global definitions
package common
import (
@@ -75,14 +75,14 @@
// ### OMCI related definitions - end
-//CallbackPairEntry to be used for OMCI send/receive correlation
+// CallbackPairEntry to be used for OMCI send/receive correlation
type CallbackPairEntry struct {
CbRespChannel chan Message
CbFunction func(context.Context, *omci.OMCI, *gp.Packet, chan Message) error
FramePrint bool //true for printing
}
-//CallbackPair to be used for ReceiveCallback init
+// CallbackPair to be used for ReceiveCallback init
type CallbackPair struct {
CbKey uint16
CbEntry CallbackPairEntry
@@ -155,8 +155,8 @@
omci.CommitSoftwareResponseType,
}
-//NewOmciCC constructor returns a new instance of a OmciCC
-//mib_db (as well as not inluded alarm_db not really used in this code? VERIFY!!)
+// NewOmciCC constructor returns a new instance of a OmciCC
+// mib_db (as well as not inluded alarm_db not really used in this code? VERIFY!!)
func NewOmciCC(ctx context.Context, deviceID string, deviceHandler IdeviceHandler,
onuDeviceEntry IonuDeviceEntry, onuAlarmManager IonuAlarmManager,
coreClient *vgrpc.Client) *OmciCC {
@@ -186,7 +186,7 @@
return &omciCC
}
-//Stop stops/resets the omciCC
+// Stop stops/resets the omciCC
func (oo *OmciCC) Stop(ctx context.Context) error {
logger.Debugw(ctx, "omciCC-stopping", log.Fields{"device-id": oo.deviceID})
//reseting all internal data, which might also be helpful for discarding any lingering tx/rx requests
@@ -297,7 +297,9 @@
}
// ReceiveMessage - Rx handler for onu messages
-// e.g. would call ReceiveOnuMessage() in case of TID=0 or Action=test ...
+//
+// e.g. would call ReceiveOnuMessage() in case of TID=0 or Action=test ...
+//
// nolint: gocyclo
func (oo *OmciCC) ReceiveMessage(ctx context.Context, rxMsg []byte) error {
//logger.Debugw(ctx,"cc-receive-omci-message", log.Fields{"RxOmciMessage-x2s": hex.EncodeToString(rxMsg)})
@@ -744,9 +746,9 @@
return next
}
-//GetOnuSwSecNextTid get the next low prio tid for the onu sw sections
-//onu sw sections uses only low priority tids
-//The mutexTid lock should be taken prior to using this function
+// GetOnuSwSecNextTid get the next low prio tid for the onu sw sections
+// onu sw sections uses only low priority tids
+// The mutexTid lock should be taken prior to using this function
func (oo *OmciCC) GetOnuSwSecNextTid() uint16 {
next := oo.tid
oo.tid++
@@ -756,20 +758,20 @@
return next
}
-//GetOnuSwSecLastTid gets the last allocated tid
-//The mutexTid lock should be taken prior to using this function
+// GetOnuSwSecLastTid gets the last allocated tid
+// The mutexTid lock should be taken prior to using this function
func (oo *OmciCC) GetOnuSwSecLastTid() uint16 {
next := oo.tid
lastAllocatedTid := next - 1
return lastAllocatedTid
}
-//LockMutexTID locks mutexTid
+// LockMutexTID locks mutexTid
func (oo *OmciCC) LockMutexTID() {
oo.mutexTid.Lock()
}
-//UnLockMutexTID unlocks mutexTid
+// UnLockMutexTID unlocks mutexTid
func (oo *OmciCC) UnLockMutexTID() {
oo.mutexTid.Unlock()
}
@@ -808,7 +810,7 @@
}
*/
-//supply a response handler for omci response messages to be transferred to the requested FSM
+// supply a response handler for omci response messages to be transferred to the requested FSM
func (oo *OmciCC) receiveOmciResponse(ctx context.Context, omciMsg *omci.OMCI, packet *gp.Packet, respChan chan Message) error {
logger.Debugw(ctx, "omci-message-response - transfer on omciRespChannel", log.Fields{"omciMsgType": omciMsg.MessageType,
@@ -852,7 +854,7 @@
// SendMibReset sends MibResetRequest
func (oo *OmciCC) SendMibReset(ctx context.Context, timeout int, highPrio bool) error {
- logger.Debugw(ctx, "send MibReset-msg to:", log.Fields{"device-id": oo.deviceID})
+ logger.Infow(ctx, "send MibReset-msg to:", log.Fields{"device-id": oo.deviceID})
request := &omci.MibResetRequest{
MeBasePacket: omci.MeBasePacket{
EntityClass: me.OnuDataClassID,
@@ -4342,8 +4344,8 @@
}
// PrepareOnuSectionsOfWindow prepares a list of sections for each window
-//Before invoking this function the oo.mutexTid needs to be be locked so that
-//GetOnuSwSecNextTid can be invoked without further locking
+// Before invoking this function the oo.mutexTid needs to be be locked so that
+// GetOnuSwSecNextTid can be invoked without further locking
func (oo *OmciCC) PrepareOnuSectionsOfWindow(ctx context.Context,
aImageMeID uint16, aAckRequest uint8, aDownloadSectionNo uint8, aSection []byte,
omciMsgsPerWindow *ia.OmciMessages, aIsExtendedOmci bool) (OmciTransferStructure, error) {
@@ -4407,7 +4409,7 @@
return omciTxReq, nil
}
-//SendOnuSwSectionsWindowWithRxSupervision sends onu swd sections
+// SendOnuSwSectionsWindowWithRxSupervision sends onu swd sections
func (oo *OmciCC) SendOnuSwSectionsWindowWithRxSupervision(ctx context.Context,
aOmciTxRequest OmciTransferStructure, aTimeout int, rxChan chan Message) {
if aOmciTxRequest.OnuSwWindow == nil {
@@ -4592,7 +4594,7 @@
return nil
}
-//SendEndSoftwareDownload sends EndSoftwareDownloadRequest
+// SendEndSoftwareDownload sends EndSoftwareDownloadRequest
func (oo *OmciCC) SendEndSoftwareDownload(ctx context.Context, timeout int, highPrio bool,
rxChan chan Message, aImageMeID uint16, aFileLen uint32, aImageCrc uint32, aIsExtendedOmci bool) error {
tid := oo.GetNextTid(highPrio)
@@ -4744,7 +4746,7 @@
return nil
}
-//SendSelfTestReq sends TestRequest
+// SendSelfTestReq sends TestRequest
func (oo *OmciCC) SendSelfTestReq(ctx context.Context, classID me.ClassID, instdID uint16, timeout int, highPrio bool, rxChan chan Message) error {
tid := oo.GetNextTid(highPrio)
logger.Debugw(ctx, "send self test request:", log.Fields{"device-id": oo.deviceID,
@@ -4799,7 +4801,7 @@
return nil
}
-//nolint: gocyclo
+// nolint: gocyclo
func (oo *OmciCC) isSuccessfulResponseWithMibDataSync(ctx context.Context, omciMsg *omci.OMCI, packet *gp.Packet) (bool, error) {
nextLayer, err := omci.MsgTypeToNextLayer(omciMsg.MessageType, false)
@@ -4814,7 +4816,7 @@
if nextLayer == omci.LayerTypeMibUploadNextResponse {
// In the case of MibUploadNextResponse, we let the packet pass so that later processing
// can examine for UnkonwnMEs and UnknownAttributes
- logger.Infow(ctx, "omci-message: MibUploadNextResponse packet with ErrorLayer - let it pass",
+ logger.Debug(ctx, "omci-message: MibUploadNextResponse packet with ErrorLayer - let it pass",
log.Fields{"device-id": oo.deviceID, "error": failure.Error()})
return false, nil
} else if nextLayer == omci.LayerTypeGetResponse {
@@ -4998,7 +5000,7 @@
oo.mutexMonReq.Unlock()
}
-//CancelRequestMonitoring terminates monitoring of outstanding omci requests
+// CancelRequestMonitoring terminates monitoring of outstanding omci requests
func (oo *OmciCC) CancelRequestMonitoring(ctx context.Context) {
logger.Debugw(ctx, "CancelRequestMonitoring entered", log.Fields{"device-id": oo.deviceID})
oo.mutexMonReq.RLock()
@@ -5016,8 +5018,8 @@
oo.mutexMonReq.RUnlock()
}
-//GetMaxOmciTimeoutWithRetries provides a timeout value greater than the maximum
-//time consumed for retry processing of a particular OMCI-request
+// GetMaxOmciTimeoutWithRetries provides a timeout value greater than the maximum
+// time consumed for retry processing of a particular OMCI-request
func (oo *OmciCC) GetMaxOmciTimeoutWithRetries() time.Duration {
return time.Duration((CDefaultRetries+1)*oo.pBaseDeviceHandler.GetOmciTimeout() + 1)
}
@@ -5026,7 +5028,7 @@
func (oo *OmciCC) SendCreateOrDeleteEthernetFrameExtendedPMME(ctx context.Context, timeout int, highPrio bool,
upstream bool, create bool, rxChan chan Message, entityID uint16, classID me.ClassID, controlBlock []uint16) (*me.ManagedEntity, error) {
tid := oo.GetNextTid(highPrio)
- logger.Debugw(ctx, "send-ethernet-frame-extended-pm-me-msg:", log.Fields{"device-id": oo.deviceID,
+ logger.Info(ctx, "send-ethernet-frame-extended-pm-me-msg:", log.Fields{"device-id": oo.deviceID,
"SequNo": strconv.FormatInt(int64(tid), 16), "InstId": strconv.FormatInt(int64(entityID), 16), "create": create, "upstream": upstream})
meParam := me.ParamData{EntityID: entityID,
diff --git a/internal/pkg/common/onu_uni_port.go b/internal/pkg/common/onu_uni_port.go
index 93774e9..27aa8dd 100755
--- a/internal/pkg/common/onu_uni_port.go
+++ b/internal/pkg/common/onu_uni_port.go
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-//Package common provides global definitions
+// Package common provides global definitions
package common
import (
@@ -34,7 +34,7 @@
"github.com/opencord/voltha-protos/v5/go/voltha"
)
-//NewOnuUniPort returns a new instance of a OnuUniPort
+// NewOnuUniPort returns a new instance of a OnuUniPort
func NewOnuUniPort(ctx context.Context, aUniID uint8, aPortNo uint32, aInstNo uint16,
aPortType UniPortType) *OnuUniPort {
logger.Infow(ctx, "init-onuUniPort", log.Fields{"uniID": aUniID,
@@ -55,9 +55,9 @@
return &OnuUniPort
}
-//CreateVolthaPort creates the Voltha port based on ONU UNI Port and informs the core about it
+// CreateVolthaPort creates the Voltha port based on ONU UNI Port and informs the core about it
func (oo *OnuUniPort) CreateVolthaPort(ctx context.Context, apDeviceHandler IdeviceHandler) error {
- logger.Debugw(ctx, "creating-voltha-uni-port", log.Fields{
+ logger.Infow(ctx, "creating-voltha-uni-port", log.Fields{
"device-id": apDeviceHandler.GetDevice().Id, "portNo": oo.PortNo})
//200630: per [VOL-3202] OF port info is now to be delivered within UniPort create
// not doing so crashes rw_core processing (at least still in 200630 version)
@@ -89,7 +89,7 @@
ofUniPortState = of.OfpPortState_OFPPS_LIVE
}
*/
- logger.Debugw(ctx, "ofPort values", log.Fields{
+ logger.Infow(ctx, "ofPort values", log.Fields{
"forUniPortName": oo.Name, "forMacBase": hwAddr,
"name": name, "hwAddr": ofHwAddr, "OperState": ofUniPortState, "capacity": capacity})
@@ -138,7 +138,7 @@
return nil
}
-//SetOperState modifies OperState of the the UniPort
+// SetOperState modifies OperState of the the UniPort
func (oo *OnuUniPort) SetOperState(aNewOperState vc.OperStatus_Types) {
oo.OperState = aNewOperState
}
@@ -150,7 +150,7 @@
aOctets[2], aOctets[1], aOctets[0])
}
-//copied from OLT Adapter: unify centrally ?
+// copied from OLT Adapter: unify centrally ?
func macAddressToUint32Array(mac string) []uint32 {
slist := strings.Split(mac, ":")
result := make([]uint32, len(slist))
diff --git a/internal/pkg/core/device_handler.go b/internal/pkg/core/device_handler.go
index 8a54933..c14008e 100755
--- a/internal/pkg/core/device_handler.go
+++ b/internal/pkg/core/device_handler.go
@@ -864,7 +864,7 @@
}
func (dh *deviceHandler) reconcileDeviceOnuInd(ctx context.Context) {
- logger.Debugw(ctx, "reconciling - simulate onu indication", log.Fields{"device-id": dh.DeviceID})
+ logger.Info(ctx, "reconciling - simulate onu indication", log.Fields{"device-id": dh.DeviceID})
pDevEntry := dh.GetOnuDeviceEntry(ctx, true)
if pDevEntry == nil {
@@ -891,7 +891,7 @@
}
func (dh *deviceHandler) ReconcileDeviceTechProf(ctx context.Context) bool {
- logger.Debugw(ctx, "reconciling - trigger tech profile config", log.Fields{"device-id": dh.DeviceID})
+ logger.Info(ctx, "reconciling - trigger tech profile config", log.Fields{"device-id": dh.DeviceID})
continueWithFlowConfig := false
@@ -908,7 +908,7 @@
persMutexLock := true
if len(pDevEntry.SOnuPersistentData.PersUniConfig) == 0 {
pDevEntry.MutexPersOnuConfig.RUnlock()
- logger.Debugw(ctx, "reconciling - no uni-configs have been stored before adapter restart - terminate reconcilement",
+ logger.Info(ctx, "reconciling - no uni-configs have been stored before adapter restart - terminate reconcilement",
log.Fields{"device-id": dh.DeviceID})
dh.stopReconciling(ctx, true, cWaitReconcileFlowNoActivity)
return continueWithFlowConfig
@@ -993,7 +993,7 @@
func (dh *deviceHandler) updateReconcileStates(ctx context.Context,
abTechProfsFound bool, abTechProfInstLoadFailed bool, abFlowsFound bool) {
if !abTechProfsFound {
- logger.Debugw(ctx, "reconciling - no TPs have been stored before adapter restart - terminate reconcilement",
+ logger.Warn(ctx, "reconciling - no TPs have been stored before adapter restart - terminate reconcilement",
log.Fields{"device-id": dh.DeviceID})
dh.stopReconciling(ctx, true, cWaitReconcileFlowNoActivity)
return
@@ -1006,7 +1006,7 @@
_ = dh.ReasonUpdate(ctx, cmn.DrTechProfileConfigDownloadSuccess, dh.IsReconcilingReasonUpdate())
}
if !abFlowsFound {
- logger.Debugw(ctx, "reconciling - no flows have been stored before adapter restart - terminate reconcilement",
+ logger.Warn(ctx, "reconciling - no flows have been stored before adapter restart - terminate reconcilement",
log.Fields{"device-id": dh.DeviceID})
dh.stopReconciling(ctx, true, cWaitReconcileFlowNoActivity)
}
@@ -1025,7 +1025,7 @@
pDevEntry.MutexPersOnuConfig.RLock()
if len(pDevEntry.SOnuPersistentData.PersUniConfig) == 0 {
pDevEntry.MutexPersOnuConfig.RUnlock()
- logger.Debugw(ctx, "reconciling - no uni-configs have been stored before adapter restart - terminate reconcilement",
+ logger.Warn(ctx, "reconciling - no uni-configs have been stored before adapter restart - terminate reconcilement",
log.Fields{"device-id": dh.DeviceID})
dh.stopReconciling(ctx, true, cWaitReconcileFlowNoActivity)
return
@@ -1076,7 +1076,7 @@
pDevEntry.MutexPersOnuConfig.RUnlock()
if !flowsFound {
- logger.Debugw(ctx, "reconciling - no flows have been stored before adapter restart - terminate reconcilement",
+ logger.Warn(ctx, "reconciling - no flows have been stored before adapter restart - terminate reconcilement",
log.Fields{"device-id": dh.DeviceID})
dh.stopReconciling(ctx, true, cWaitReconcileFlowNoActivity)
return
@@ -1169,18 +1169,18 @@
case cWaitReconcileFlowNoActivity:
// waiting on channel inputs from VlanConfig for all UNI's to be aborted on error condition
case cWaitReconcileFlowAbortOnError:
- logger.Debugw(ctx, "waitReconcileFlow aborted on error",
+ logger.Warn(ctx, "waitReconcileFlow aborted on error",
log.Fields{"device-id": dh.DeviceID, "rxEntries": reconciledUniVlanConfigEntries})
return
// waiting on channel inputs from VlanConfig for all UNI's to be aborted on success condition
case cWaitReconcileFlowAbortOnSuccess:
- logger.Debugw(ctx, "waitReconcileFlow aborted on success",
+ logger.Warn(ctx, "waitReconcileFlow aborted on success",
log.Fields{"device-id": dh.DeviceID, "rxEntries": reconciledUniVlanConfigEntries})
return
// this should be a valid UNI vlan config done indication
default:
if uniIndication < platform.MaxUnisPerOnu {
- logger.Debugw(ctx, "reconciling flows has been finished in time for this UNI",
+ logger.Info(ctx, "reconciling flows has been finished in time for this UNI",
log.Fields{"device-id": dh.DeviceID, "uni-id": uniIndication})
if reconciledUniVlanConfigEntries, appended =
dh.appendIfMissing(reconciledUniVlanConfigEntries, uint8(uniIndication)); appended {
@@ -1679,7 +1679,7 @@
}
//TODO Need to Update Device Reason To CORE as part of device update userstory
} else {
- logger.Debugw(ctx, "reconciling - don't notify core about DeviceUpdate",
+ logger.Infow(ctx, "reconciling - don't notify core about DeviceUpdate",
log.Fields{"device-id": dh.DeviceID})
}
@@ -1703,7 +1703,7 @@
)
*/
if !dh.IsReconciling() {
- logger.Debugw(ctx, "adding-pon-port", log.Fields{"device-id": dh.DeviceID, "ponPortNo": dh.ponPortNumber})
+ logger.Infow(ctx, "adding-pon-port", log.Fields{"device-id": dh.DeviceID, "ponPortNo": dh.ponPortNumber})
var ponPortNo uint32 = 1
if dh.ponPortNumber != 0 {
ponPortNo = dh.ponPortNumber
@@ -1724,7 +1724,7 @@
return
}
} else {
- logger.Debugw(ctx, "reconciling - pon-port already added", log.Fields{"device-id": dh.DeviceID})
+ logger.Infow(ctx, "reconciling - pon-port already added", log.Fields{"device-id": dh.DeviceID})
}
logger.Debugw(ctx, "doStateInit-done", log.Fields{"device-id": dh.DeviceID})
}
@@ -1990,7 +1990,7 @@
logger.Errorw(ctx, "error-updating-device-state", log.Fields{"device-id": dh.DeviceID, "error": err})
}
} else {
- logger.Debugw(ctx, "reconciling - don't notify core about DeviceStateUpdate to ACTIVATING",
+ logger.Info(ctx, "reconciling - don't notify core about DeviceStateUpdate to ACTIVATING",
log.Fields{"device-id": dh.DeviceID})
pDevEntry.MutexPersOnuConfig.RLock()
@@ -2165,7 +2165,7 @@
//state checking to prevent unneeded processing (eg. on ONU 'unreachable' and 'down')
// (but note that the deviceReason may also have changed to e.g. TechProf*Delete_Success in between)
if dh.getDeviceReason() != cmn.DrStoppingOpenomci {
- logger.Debugw(ctx, "updateInterface-started - stopping-device", log.Fields{"device-id": dh.DeviceID})
+ logger.Info(ctx, "updateInterface-started - stopping-device", log.Fields{"device-id": dh.DeviceID})
//stop all running FSM processing - make use of the DH-state as mirrored in the deviceReason
//here no conflict with aborted FSM's should arise as a complete OMCI initialization is assumed on ONU-Up
@@ -2386,7 +2386,7 @@
}
func (dh *deviceHandler) processMibDownloadDoneEvent(ctx context.Context, devEvent cmn.OnuDeviceEvent) {
- logger.Debugw(ctx, "MibDownloadDone event received, unlocking the ONU interfaces", log.Fields{"device-id": dh.DeviceID})
+ logger.Info(ctx, "MibDownloadDone event received, unlocking the ONU interfaces", log.Fields{"device-id": dh.DeviceID})
pDevEntry := dh.GetOnuDeviceEntry(ctx, false)
if pDevEntry == nil {
logger.Errorw(ctx, "No valid OnuDevice - aborting", log.Fields{"device-id": dh.DeviceID})
@@ -2421,7 +2421,7 @@
logger.Debugw(ctx, "dev state updated to 'Oper.Active'", log.Fields{"device-id": dh.DeviceID})
}
} else {
- logger.Debugw(ctx, "reconciling - don't notify core about updated device info and DeviceStateUpdate to ACTIVE",
+ logger.Info(ctx, "reconciling - don't notify core about updated device info and DeviceStateUpdate to ACTIVE",
log.Fields{"device-id": dh.DeviceID})
}
_ = dh.ReasonUpdate(ctx, cmn.DrInitialMibDownloaded, !dh.IsReconciling() || dh.IsReconcilingReasonUpdate())
@@ -2459,7 +2459,7 @@
pDevEntry.MutexPersOnuConfig.RLock()
if dh.IsReconciling() && pDevEntry.SOnuPersistentData.PersUniDisableDone {
pDevEntry.MutexPersOnuConfig.RUnlock()
- logger.Debugw(ctx, "reconciling - uni-ports were disabled by admin before adapter restart - keep the ports locked",
+ logger.Warn(ctx, "reconciling - uni-ports were disabled by admin before adapter restart - keep the ports locked",
log.Fields{"device-id": dh.DeviceID})
dh.mutexForDisableDeviceRequested.Lock()
dh.disableDeviceRequested = true
@@ -2505,7 +2505,7 @@
log.Fields{"device-id": dh.DeviceID, "err": err})
}
} else {
- logger.Debugw(ctx, "reconciling - don't notify core that onu went to active but triggered tech profile config",
+ logger.Info(ctx, "reconciling - don't notify core that onu went to active but trigger tech profile config",
log.Fields{"device-id": dh.DeviceID})
dh.ReconcileDeviceTechProf(ctx)
@@ -2609,7 +2609,7 @@
// therefore it must be ensured that reconciling of flow config is only started on the first pass of this code position
dh.mutexReconcilingFirstPassFlag.Lock()
if dh.reconcilingFirstPass {
- logger.Debugw(ctx, "reconciling - OmciAniConfigDone first pass, start flow processing", log.Fields{"device-id": dh.DeviceID})
+ logger.Info(ctx, "reconciling - OmciAniConfigDone first pass, start flow processing", log.Fields{"device-id": dh.DeviceID})
dh.reconcilingFirstPass = false
go dh.ReconcileDeviceFlowConfig(ctx)
}
@@ -2723,7 +2723,7 @@
logger.Infow(ctx, "OnuUniPort-added", log.Fields{"device-id": dh.DeviceID, "for PortNo": uniNo})
} //error logging already within UniPort method
} else {
- logger.Debugw(ctx, "reconciling - OnuUniPort already added", log.Fields{"for PortNo": uniNo, "device-id": dh.DeviceID})
+ logger.Warn(ctx, "reconciling - OnuUniPort already added", log.Fields{"for PortNo": uniNo, "device-id": dh.DeviceID})
}
}
}
@@ -2816,7 +2816,7 @@
}
}(uniPort)
} else {
- logger.Debugw(ctx, "reconciling - don't notify core about PortStateUpdate", log.Fields{"device-id": dh.DeviceID})
+ logger.Debug(ctx, "reconciling - don't notify core about PortStateUpdate", log.Fields{"device-id": dh.DeviceID})
}
}
}
@@ -2845,7 +2845,7 @@
}
}(uniPort)
} else {
- logger.Debugw(ctx, "reconciling - don't notify core about PortStateUpdate", log.Fields{"device-id": dh.DeviceID})
+ logger.Debug(ctx, "reconciling - don't notify core about PortStateUpdate", log.Fields{"device-id": dh.DeviceID})
}
}
@@ -2907,7 +2907,7 @@
logger.Warnw(ctx, "could not send ONU_ACTIVATED event",
log.Fields{"device-id": aDeviceID, "error": err})
}
- logger.Debugw(ctx, "ctx, ONU_ACTIVATED event sent to KAFKA",
+ logger.Infow(ctx, "ctx, ONU_ACTIVATED event sent to KAFKA",
log.Fields{"device-id": aDeviceID, "with-EventName": de.DeviceEventName})
}
@@ -3507,7 +3507,7 @@
//TODO!! verify and start pending flow configuration
//some pending config request my exist in case the UniVlanConfig FSM was already started - with internal data -
//but execution was set to 'on hold' as first the TechProfile config had to be applied
-
+ logger.Info(ctx, "Verifying UniVlanConfig Request", log.Fields{"device-id": dh.DeviceID, "UniPort": apUniPort.PortNo, "techprofile-id": aTpID})
dh.lockVlanConfig.RLock()
if pVlanFilterFsm, exist := dh.UniVlanConfigFsmMap[apUniPort.UniID]; exist {
dh.lockVlanConfig.RUnlock()
@@ -3592,7 +3592,7 @@
aUniVlanFlowParams *[]cmn.UniVlanFlowParams, aWriteToKvStore bool) error {
if dh.IsReconciling() {
- logger.Debugw(ctx, "reconciling - don't store persistent UniFlowConfig", log.Fields{"device-id": dh.DeviceID})
+ logger.Info(ctx, "reconciling - don't store persistent UniFlowConfig", log.Fields{"device-id": dh.DeviceID})
return nil
}
logger.Debugw(ctx, "Store or clear persistent UniFlowConfig", log.Fields{"device-id": dh.DeviceID})
@@ -4006,7 +4006,7 @@
}
func (dh *deviceHandler) PrepareReconcilingWithActiveAdapter(ctx context.Context) {
- logger.Debugw(ctx, "prepare to reconcile the ONU with adapter using persistency data", log.Fields{"device-id": dh.device.Id})
+ logger.Info(ctx, "prepare to reconcile the ONU with adapter using persistency data", log.Fields{"device-id": dh.device.Id})
if err := dh.resetFsms(ctx, false); err != nil {
logger.Errorw(ctx, "reset of FSMs failed!", log.Fields{"device-id": dh.DeviceID, "error": err})
// TODO: fatal error reset ONU, delete deviceHandler!
@@ -4079,7 +4079,7 @@
}
func (dh *deviceHandler) StartReconciling(ctx context.Context, skipOnuConfig bool) {
- logger.Debugw(ctx, "start reconciling", log.Fields{"skipOnuConfig": skipOnuConfig, "device-id": dh.DeviceID})
+ logger.Info(ctx, "start reconciling", log.Fields{"skipOnuConfig": skipOnuConfig, "device-id": dh.DeviceID})
connectStatus := voltha.ConnectStatus_UNREACHABLE
operState := voltha.OperStatus_UNKNOWN
@@ -4090,7 +4090,7 @@
log.Fields{"timeout": dh.reconcileExpiryComplete, "device-id": dh.DeviceID})
select {
case success := <-dh.chReconcilingFinished:
- logger.Debugw(ctx, "reconciling finished signal received",
+ logger.Info(ctx, "reconciling finished signal received",
log.Fields{"device-id": dh.DeviceID, "dh.chReconcilingFinished": dh.chReconcilingFinished})
// To guarantee that the case-branch below is completely processed before reconciling processing is continued,
// dh.mutexReconcilingFlag is locked already here. Thereby it is ensured, that further reconciling processing is stopped
@@ -4124,7 +4124,7 @@
logger.Debugw(ctx, "Core DeviceStateUpdate",
log.Fields{"device-id": dh.device.Id, "connectStatus": connectStatus, "operState": operState})
}
- logger.Debugw(ctx, "reconciling has been finished in time",
+ logger.Info(ctx, "reconciling has been finished in time",
log.Fields{"device-id": dh.DeviceID})
if err := dh.updateDeviceStateInCore(ctx, &ca.DeviceStateFilter{
DeviceId: dh.DeviceID,
@@ -4193,7 +4193,7 @@
}
func (dh *deviceHandler) stopReconciling(ctx context.Context, success bool, reconcileFlowResult uint16) {
- logger.Debugw(ctx, "stop reconciling", log.Fields{"device-id": dh.DeviceID, "success": success})
+ logger.Warn(ctx, "stop reconciling", log.Fields{"device-id": dh.DeviceID, "success": success})
if dh.IsReconciling() {
dh.sendChReconcileFinished(success)
if reconcileFlowResult != cWaitReconcileFlowNoActivity {
@@ -4402,7 +4402,7 @@
// process the flow completely before proceeding to handle the next flow
case flowCb := <-dh.flowCbChan[uniID]:
startTime := time.Now()
- logger.Debugw(flowCb.ctx, "serial-flow-processor--start", log.Fields{"device-id": dh.DeviceID})
+ logger.Info(flowCb.ctx, "serial-flow-processor--start", log.Fields{"device-id": dh.DeviceID})
respChan := make(chan error)
if flowCb.addFlow {
go dh.addFlowItemToUniPort(flowCb.ctx, flowCb.flowItem, flowCb.uniPort, flowCb.flowMetaData, &respChan)
@@ -4411,7 +4411,7 @@
}
// Block on response and tunnel it back to the caller
*flowCb.respChan <- <-respChan
- logger.Debugw(flowCb.ctx, "serial-flow-processor--end",
+ logger.Info(flowCb.ctx, "serial-flow-processor--end",
log.Fields{"device-id": dh.DeviceID, "absoluteTimeForFlowProcessingInSecs": time.Since(startTime).Seconds()})
case <-dh.stopFlowMonitoringRoutine[uniID]:
logger.Infow(context.Background(), "stopping-flow-handler-routine", log.Fields{"device-id": dh.DeviceID})
diff --git a/internal/pkg/core/openonu.go b/internal/pkg/core/openonu.go
index bbcd956..f22cef7 100755
--- a/internal/pkg/core/openonu.go
+++ b/internal/pkg/core/openonu.go
@@ -938,7 +938,7 @@
// DownloadTechProfile is part of the ONU Inter-adapter service API.
func (oo *OpenONUAC) DownloadTechProfile(ctx context.Context, tProfile *ia.TechProfileDownloadMessage) (*empty.Empty, error) {
- logger.Debugw(ctx, "download-tech-profile", log.Fields{"device-id": tProfile.DeviceId, "uni-id": tProfile.UniId})
+ logger.Info(ctx, "download-tech-profile", log.Fields{"device-id": tProfile.DeviceId, "uni-id": tProfile.UniId})
if handler := oo.getDeviceHandler(ctx, tProfile.DeviceId, false); handler != nil {
if err := handler.handleTechProfileDownloadRequest(log.WithSpanFromContext(context.Background(), ctx), tProfile); err != nil {
diff --git a/internal/pkg/mib/mib_sync.go b/internal/pkg/mib/mib_sync.go
index 155a83e..b5fd996 100755
--- a/internal/pkg/mib/mib_sync.go
+++ b/internal/pkg/mib/mib_sync.go
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-//Package mib provides the utilities for managing the onu mib
+// Package mib provides the utilities for managing the onu mib
package mib
import (
@@ -583,7 +583,7 @@
if msgLayer != nil {
msgObj, msgOk := msgLayer.(*omci.MibResetResponse)
if msgOk {
- logger.Debugw(ctx, "MibResetResponse Data", log.Fields{"data-fields": msgObj})
+ logger.Infow(ctx, "MibResetResponse Data", log.Fields{"data-fields": msgObj})
if msgObj.Result == me.Success {
oo.MutexPersOnuConfig.Lock()
oo.SOnuPersistentData.PersMibDataSyncAdpt = cmn.MdsDefaultMib
@@ -958,7 +958,7 @@
return err
}
-//HandleSwImageIndications updates onuSwImageIndications with the ONU data just received
+// HandleSwImageIndications updates onuSwImageIndications with the ONU data just received
func (oo *OnuDeviceEntry) HandleSwImageIndications(ctx context.Context, entityID uint16, meAttributes me.AttributeValueMap) bool {
var imageVersion string
@@ -1382,7 +1382,7 @@
}
}
-//GetActiveImageMeID returns the Omci MeId of the active ONU image together with error code for validity
+// GetActiveImageMeID returns the Omci MeId of the active ONU image together with error code for validity
func (oo *OnuDeviceEntry) GetActiveImageMeID(ctx context.Context) (uint16, error) {
oo.mutexOnuSwImageIndications.RLock()
if oo.onuSwImageIndications.ActiveEntityEntry.Valid {
@@ -1394,7 +1394,7 @@
return 0xFFFF, fmt.Errorf("no valid active image found: %s", oo.deviceID)
}
-//GetInactiveImageMeID returns the Omci MeId of the inactive ONU image together with error code for validity
+// GetInactiveImageMeID returns the Omci MeId of the inactive ONU image together with error code for validity
func (oo *OnuDeviceEntry) GetInactiveImageMeID(ctx context.Context) (uint16, error) {
oo.mutexOnuSwImageIndications.RLock()
if oo.onuSwImageIndications.InActiveEntityEntry.Valid {
@@ -1406,7 +1406,7 @@
return 0xFFFF, fmt.Errorf("no valid inactive image found: %s", oo.deviceID)
}
-//IsImageToBeCommitted returns true if the active image is still uncommitted
+// IsImageToBeCommitted returns true if the active image is still uncommitted
func (oo *OnuDeviceEntry) IsImageToBeCommitted(ctx context.Context, aImageID uint16) bool {
oo.mutexOnuSwImageIndications.RLock()
if oo.onuSwImageIndications.ActiveEntityEntry.Valid {
@@ -1475,7 +1475,7 @@
}
}
} else {
- logger.Debugw(ctx, "No MIB template found", log.Fields{"path": oo.mibTemplatePath, "device-id": oo.deviceID})
+ logger.Infow(ctx, "No MIB template found", log.Fields{"path": oo.mibTemplatePath, "device-id": oo.deviceID})
}
} else {
logger.Errorf(ctx, "Get from kvstore operation failed for path",
@@ -1528,7 +1528,7 @@
return allTpInstPresent
}
-//CancelProcessing terminates potentially running reconciling processes and stops the FSM
+// CancelProcessing terminates potentially running reconciling processes and stops the FSM
func (oo *OnuDeviceEntry) CancelProcessing(ctx context.Context) {
logger.Debugw(ctx, "CancelProcessing entered", log.Fields{"device-id": oo.deviceID})
if oo.isReconcilingFlows() {
diff --git a/internal/pkg/mib/onu_device_entry.go b/internal/pkg/mib/onu_device_entry.go
index 35e6357..b97a209 100755
--- a/internal/pkg/mib/onu_device_entry.go
+++ b/internal/pkg/mib/onu_device_entry.go
@@ -1015,7 +1015,7 @@
//use asynchronous channel sending to avoid stucking on non-waiting receiver
select {
case oo.chReconcilingFlowsFinished <- value:
- logger.Debugw(ctx, "reconciling - flows finished sent", log.Fields{"device-id": oo.deviceID})
+ logger.Info(ctx, "reconciling - flows finished sent", log.Fields{"device-id": oo.deviceID})
default:
logger.Infow(ctx, "reconciling - flows finished not sent!", log.Fields{"device-id": oo.deviceID})
}