Revert "VOL-3049 Alarm sync and audit"
This reverts commit a2592fe97dcff5cef1df67066812616230f3a1a9.
Reason for revert: Crashloop backoff in deployment.
Change-Id: I436ee4a02f3b2b45027452833cbbb798f9dedf7d
diff --git a/internal/pkg/onuadaptercore/omci_cc.go b/internal/pkg/onuadaptercore/omci_cc.go
index 1f32be0..3a46f45 100644
--- a/internal/pkg/onuadaptercore/omci_cc.go
+++ b/internal/pkg/onuadaptercore/omci_cc.go
@@ -156,6 +156,7 @@
omciCC.hpTid = 0x8000
omciCC.uploadSequNo = 0
omciCC.uploadNoOfCmds = 0
+
omciCC.txQueue = list.New()
omciCC.rxSchedulerMap = make(map[uint16]callbackPairEntry)
@@ -778,58 +779,6 @@
return oo.send(ctx, pkt, timeout, 0, highPrio, omciRxCallbackPair)
}
-func (oo *omciCC) sendGetAllAlarm(ctx context.Context, alarmRetreivalMode uint8, timeout int, highPrio bool) error {
- logger.Debugw(ctx, "send GetAllAlarms-msg to:", log.Fields{"device-id": oo.deviceID})
- request := &omci.GetAllAlarmsRequest{
- MeBasePacket: omci.MeBasePacket{
- EntityClass: me.OnuDataClassID,
- },
- AlarmRetrievalMode: byte(alarmRetreivalMode),
- }
- tid := oo.getNextTid(highPrio)
- pkt, err := serialize(ctx, omci.GetAllAlarmsRequestType, request, tid)
- if err != nil {
- logger.Errorw(ctx, "Cannot serialize GetAllAlarmsRequest", log.Fields{
- "Err": err, "device-id": oo.deviceID})
- return err
- }
- oo.pBaseDeviceHandler.pAlarmMgr.alarmUploadSeqNo = 0
- oo.pBaseDeviceHandler.pAlarmMgr.alarmUploadNoOfCmds = 0
-
- omciRxCallbackPair := callbackPair{
- cbKey: tid,
- cbEntry: callbackPairEntry{(*oo.pBaseDeviceHandler.pAlarmMgr).eventChannel,
- oo.receiveOmciResponse, true},
- }
- return oo.send(ctx, pkt, timeout, 0, highPrio, omciRxCallbackPair)
-}
-
-func (oo *omciCC) sendGetAllAlarmNext(ctx context.Context, timeout int, highPrio bool) error {
- alarmUploadSeqNo := oo.pBaseDeviceHandler.pAlarmMgr.alarmUploadSeqNo
- logger.Debugw(ctx, "send sendGetAllAlarmNext-msg to:", log.Fields{"device-id": oo.deviceID,
- "alarmUploadSeqNo": alarmUploadSeqNo})
- request := &omci.GetAllAlarmsNextRequest{
- MeBasePacket: omci.MeBasePacket{
- EntityClass: me.OnuDataClassID,
- },
- CommandSequenceNumber: alarmUploadSeqNo,
- }
- tid := oo.getNextTid(highPrio)
- pkt, err := serialize(ctx, omci.GetAllAlarmsNextRequestType, request, tid)
- if err != nil {
- logger.Errorw(ctx, "Cannot serialize GetAllAlarmsNextRequest", log.Fields{
- "Err": err, "device-id": oo.deviceID})
- return err
- }
- oo.pBaseDeviceHandler.pAlarmMgr.alarmUploadSeqNo++
-
- omciRxCallbackPair := callbackPair{
- cbKey: tid,
- cbEntry: callbackPairEntry{(*oo.pBaseDeviceHandler.pAlarmMgr).eventChannel, oo.receiveOmciResponse, true},
- }
- return oo.send(ctx, pkt, timeout, 0, highPrio, omciRxCallbackPair)
-}
-
func (oo *omciCC) sendCreateGalEthernetProfile(ctx context.Context, timeout int, highPrio bool) *me.ManagedEntity {
tid := oo.getNextTid(highPrio)
logger.Debugw(ctx, "send GalEnetProfile-Create-msg:", log.Fields{"device-id": oo.deviceID,