VOL-3847: Support FEC Performance Monitoring History Data L2 PM Counter
VOL-3848: Support GEM Port Network Ctp Performance Monitoring History Data L2 PM Counter
- also re-org code to group common functionality into utility functions
Change-Id: I087125ed4992415dac7b1a6cf84bfe9c1177b469
diff --git a/internal/pkg/onuadaptercore/omci_ani_config.go b/internal/pkg/onuadaptercore/omci_ani_config.go
index 6cb96a3..03bf9ea 100644
--- a/internal/pkg/onuadaptercore/omci_ani_config.go
+++ b/internal/pkg/onuadaptercore/omci_ani_config.go
@@ -682,6 +682,10 @@
meInstance := oFsm.pOmciCC.sendDeleteGemNCTP(log.WithSpanFromContext(context.TODO(), ctx), ConstDefaultOmciTimeout, true,
oFsm.pAdaptFsm.commChan, loGemPortID)
oFsm.pLastTxMeInstance = meInstance
+ // Mark the gem port to be removed for Performance History monitoring
+ if oFsm.pDeviceHandler.pOnuMetricsMgr != nil {
+ oFsm.pDeviceHandler.pOnuMetricsMgr.RemoveGemPortForPerfMonitoring(loGemPortID)
+ }
}
func (oFsm *uniPonAniConfigFsm) enterResettingTcont(ctx context.Context, e *fsm.Event) {
@@ -1011,6 +1015,10 @@
_ = oFsm.pAdaptFsm.pFsm.Event(aniEvReset)
return
}
+ // Mark the gem port to be removed for Performance History monitoring
+ if oFsm.pDeviceHandler.pOnuMetricsMgr != nil {
+ oFsm.pDeviceHandler.pOnuMetricsMgr.AddGemPortForPerfMonitoring(gemPortAttribs.gemPortID)
+ }
} //for all GemPorts of this T-Cont
// if Config has been done for all GemPort instances let the FSM proceed