[VOL-5551] Optimize INFO logs in UniVlanConfigFSM and AniConfigFSM
Signed-off-by: bseeniva <balaji.seenivasan@radisys.com>
Change-Id: Iab0db1dd5692692036ea38597db8e86f2e75166b
diff --git a/VERSION b/VERSION
index 6ad4f1e..3caff04 100755
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.13.9
+2.13.10
diff --git a/internal/pkg/avcfg/omci_ani_config.go b/internal/pkg/avcfg/omci_ani_config.go
index 18d52fd..02fa71a 100755
--- a/internal/pkg/avcfg/omci_ani_config.go
+++ b/internal/pkg/avcfg/omci_ani_config.go
@@ -333,7 +333,7 @@
//nolint:gocyclo
func (oFsm *UniPonAniConfigFsm) prepareAndEnterConfigState(ctx context.Context, _ *fsm.Event) {
- logger.Info(ctx, "UniPonAniConfigFsm prepareAndEnterConfigState start", log.Fields{
+ logger.Debugw(ctx, "UniPonAniConfigFsm prepareAndEnterConfigState start", log.Fields{
"device-id": oFsm.deviceID})
aPAFsm := oFsm.PAdaptFsm
if aPAFsm != nil && aPAFsm.PFsm != nil {
@@ -513,7 +513,7 @@
}
}
- logger.Info(ctx, "UniPonAniConfigFsm prepareAndEnterConfigState end", log.Fields{
+ logger.Debugw(ctx, "UniPonAniConfigFsm prepareAndEnterConfigState end", log.Fields{
"device-id": oFsm.deviceID})
}
}
@@ -689,14 +689,14 @@
//nolint:unparam
func (oFsm *UniPonAniConfigFsm) enterCreatingGemNCTPs(ctx context.Context, e *fsm.Event) {
- logger.Info(ctx, "UniPonAniConfigFsm - start creating GemNWCtp loop", log.Fields{
+ logger.Debugw(ctx, "UniPonAniConfigFsm - start creating GemNWCtp loop", log.Fields{
"device-id": oFsm.deviceID, "uni-id": oFsm.pOnuUniPort.UniID})
go oFsm.performCreatingGemNCTPs(ctx)
}
//nolint:unparam
func (oFsm *UniPonAniConfigFsm) enterCreatingGemIWs(ctx context.Context, e *fsm.Event) {
- logger.Info(ctx, "UniPonAniConfigFsm - start creating GemIwTP loop", log.Fields{
+ logger.Debugw(ctx, "UniPonAniConfigFsm - start creating GemIwTP loop", log.Fields{
"device-id": oFsm.deviceID, "uni-id": oFsm.pOnuUniPort.UniID})
go oFsm.performCreatingGemIWs(ctx)
}
@@ -709,13 +709,13 @@
func (oFsm *UniPonAniConfigFsm) enterSettingDot1PMapper(ctx context.Context, e *fsm.Event) {
- 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.Info(ctx, "UniPonAniConfigFsm Tx Set::1pMapper", log.Fields{
- "EntitytId": strconv.FormatInt(int64(oFsm.mapperSP0ID), 16),
- "in state": e.FSM.Current(), "device-id": oFsm.deviceID})
+ logger.Debugw(ctx, "UniPonAniConfigFsm Tx Set::.1pMapper with all PBits set", log.Fields{
+ "EntitytId": 0x8042, /*cmp above*/
+ "EntitytId_Value": strconv.FormatInt(int64(oFsm.mapperSP0ID), 16),
+ "toGemIw": 1024, // or the actual value if available
+ "in state": e.FSM.Current(),
+ "device-id": oFsm.deviceID,
+ "uni-id": oFsm.pOnuUniPort.UniID})
meParams := me.ParamData{
EntityID: oFsm.mapperSP0ID,
@@ -1075,7 +1075,7 @@
//nolint:unparam
func (oFsm *UniPonAniConfigFsm) enterResettingTcont(ctx context.Context, e *fsm.Event) {
- logger.Info(ctx, "UniPonAniConfigFsm - start resetting the TCont", log.Fields{
+ logger.Debugw(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
@@ -1111,7 +1111,7 @@
//nolint:unparam
func (oFsm *UniPonAniConfigFsm) enterRemoving1pMapper(ctx context.Context, e *fsm.Event) {
- logger.Info(ctx, "UniPonAniConfigFsm - start deleting the .1pMapper", log.Fields{
+ logger.Debugw(ctx, "UniPonAniConfigFsm - start deleting the .1pMapper", log.Fields{
"device-id": oFsm.deviceID, "uni-id": oFsm.pOnuUniPort.UniID})
var mapGemPortParams map[uint16]*gemPortParamStruct
unicastGemCount := 0
@@ -1170,7 +1170,7 @@
//nolint:unparam
func (oFsm *UniPonAniConfigFsm) enterRemovingAniBPCD(ctx context.Context, e *fsm.Event) {
- logger.Info(ctx, "UniPonAniConfigFsm - start deleting the ANI MBCD", log.Fields{
+ logger.Debugw(ctx, "UniPonAniConfigFsm - start deleting the ANI MBCD", log.Fields{
"device-id": oFsm.deviceID, "uni-id": oFsm.pOnuUniPort.UniID})
oFsm.mutexPLastTxMeInstance.Lock()
@@ -1277,7 +1277,7 @@
}
func (oFsm *UniPonAniConfigFsm) processOmciAniMessages(ctx context.Context) {
- logger.Info(ctx, "Start UniPonAniConfigFsm Msg processing", log.Fields{"for device-id": oFsm.deviceID})
+ logger.Debugw(ctx, "Start UniPonAniConfigFsm Msg processing", log.Fields{"for device-id": oFsm.deviceID})
loop:
for {
// case <-ctx.Done():
diff --git a/internal/pkg/avcfg/omci_vlan_config.go b/internal/pkg/avcfg/omci_vlan_config.go
index 1afc480..43ab70a 100755
--- a/internal/pkg/avcfg/omci_vlan_config.go
+++ b/internal/pkg/avcfg/omci_vlan_config.go
@@ -1969,7 +1969,7 @@
// break loop
message, ok := <-oFsm.PAdaptFsm.CommChan
if !ok {
- logger.Info(ctx, "UniVlanConfigFsm Rx Msg - could not read from channel", log.Fields{"device-id": oFsm.deviceID})
+ logger.Warnw(ctx, "UniVlanConfigFsm 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(VlanEvReset)
break loop