VOL-3049 initial support changes for alarm notifications
Change-Id: Ic6e17196e6955a669e2bf8fc248bdbdbca1654c5
diff --git a/internal/pkg/onuadaptercore/omci_cc.go b/internal/pkg/onuadaptercore/omci_cc.go
index 73b4901..dbdaa93 100644
--- a/internal/pkg/onuadaptercore/omci_cc.go
+++ b/internal/pkg/onuadaptercore/omci_cc.go
@@ -22,7 +22,6 @@
"context"
"encoding/binary"
"encoding/hex"
- "errors"
"fmt"
"strconv"
"sync"
@@ -200,9 +199,20 @@
}
// Rx handler for omci messages
-func (oo *omciCC) receiveOnuMessage(ctx context.Context, omciMsg *omci.OMCI) error {
+func (oo *omciCC) receiveOnuMessage(ctx context.Context, omciMsg *omci.OMCI, packet *gp.Packet) error {
logger.Debugw(ctx, "rx-onu-autonomous-message", log.Fields{"omciMsgType": omciMsg.MessageType,
"payload": hex.EncodeToString(omciMsg.Payload)})
+ switch omciMsg.MessageType {
+ case omci.AlarmNotificationType:
+ data := OmciMessage{
+ OmciMsg: omciMsg,
+ OmciPacket: packet,
+ }
+ go oo.pBaseDeviceHandler.pAlarmMgr.handleOmciAlarmNotificationMessage(ctx, data)
+ return nil
+ default:
+ return fmt.Errorf("receiveOnuMessageType %s unimplemented", omciMsg.MessageType.String())
+ }
/*
msgType = rxFrame.fields["message_type"] //assumed OmciOperationsValue
rxOnuFrames++
@@ -246,7 +256,6 @@
}
}
*/
- return errors.New("receiveOnuMessage unimplemented")
}
// Rx handler for onu messages
@@ -308,7 +317,7 @@
// Not a response
logger.Debug(ctx, "RxMsg is no Omci Response Message")
if omciMsg.TransactionID == 0 {
- return oo.receiveOnuMessage(ctx, omciMsg)
+ return oo.receiveOnuMessage(ctx, omciMsg, &packet)
}
logger.Errorw(ctx, "Unexpected TransCorrId != 0 not accepted for autonomous messages",
log.Fields{"msgType": omciMsg.MessageType, "payload": hex.EncodeToString(omciMsg.Payload),