Creating one channel per ONU
Using state machine for OperState in OLT, NNI, PON
Using state machien ONU OperState and added gRPC API to list ONUs with
statuses
Change-Id: I663133510ef4a672e3807cd7e0db9eca8b7ab0d2
diff --git a/internal/bbsim/devices/onu.go b/internal/bbsim/devices/onu.go
index 1569127..e9df108 100644
--- a/internal/bbsim/devices/onu.go
+++ b/internal/bbsim/devices/onu.go
@@ -6,37 +6,73 @@
log "github.com/sirupsen/logrus"
)
+var onuLogger = log.WithFields(log.Fields{
+ "module": "ONU",
+})
+
func CreateONU(olt OltDevice, pon PonPort, id uint32) Onu {
o := Onu{
ID: id,
- OperState: DOWN,
PonPortID: pon.ID,
PonPort: pon,
+ channel: make(chan Message),
}
o.SerialNumber = o.NewSN(olt.ID, pon.ID, o.ID)
+ // NOTE this state machine is used to track the operational
+ // state as requested by VOLTHA
+ o.OperState = getOperStateFSM(func(e *fsm.Event) {
+ onuLogger.WithFields(log.Fields{
+ "ID": o.ID,
+ }).Debugf("Changing ONU OperState from %s to %s", e.Src, e.Dst)
+ })
+
+ // NOTE this state machine is used to activate the OMCI, EAPOL and DHCP clients
o.InternalState = fsm.NewFSM(
"created",
fsm.Events{
{Name: "discover", Src: []string{"created"}, Dst: "discovered"},
{Name: "enable", Src: []string{"discovered"}, Dst: "enabled"},
+ {Name: "start_omci", Src: []string{"enabled"}, Dst: "starting_openomci"},
},
fsm.Callbacks{
"enter_state": func(e *fsm.Event) {
- olt.stateChange(e)
+ onuLogger.WithFields(log.Fields{
+ "ID": o.ID,
+ }).Debugf("Changing ONU InternalState from %s to %s", e.Src, e.Dst)
},
},
)
return o
}
-func (o Onu) stateChange(e *fsm.Event) {
- log.WithFields(log.Fields{
+func (o Onu) processOnuMessages(stream openolt.Openolt_EnableIndicationServer) {
+ onuLogger.WithFields(log.Fields{
"onuID": o.ID,
"onuSN": o.SerialNumber,
- "dstState": e.Dst,
- "srcState": e.Src,
- }).Debugf("ONU state has changed")
+ }).Debug("Started ONU Indication Channel")
+
+ for message := range o.channel {
+ onuLogger.WithFields(log.Fields{
+ "onuID": o.ID,
+ "onuSN": o.SerialNumber,
+ "messageType": message.Type,
+ }).Trace("Received message")
+
+ switch message.Type {
+ case OnuDiscIndication:
+ msg, _ := message.Data.(OnuDiscIndicationMessage)
+ o.sendOnuDiscIndication(msg, stream)
+ case OnuIndication:
+ msg, _ := message.Data.(OnuIndicationMessage)
+ o.sendOnuIndication(msg, stream)
+ case OMCI:
+ o.InternalState.Event("start_omci")
+ onuLogger.Warn("Don't know how to handle OMCI Messages yet...")
+ default:
+ onuLogger.Warnf("Received unknown message data %v for type %v in OLT channel", message.Data, message.Type)
+ }
+ }
}
func (o Onu) NewSN(oltid int, intfid uint32, onuid uint32) *openolt.SerialNumber {
@@ -58,7 +94,8 @@
if err := stream.Send(&openolt.Indication{Data: discoverData}); err != nil {
log.Error("Failed to send Indication_OnuDiscInd: %v", err)
}
- log.WithFields(log.Fields{
+ o.InternalState.Event("discover")
+ onuLogger.WithFields(log.Fields{
"IntfId": msg.Onu.PonPortID,
"SerialNumber": msg.Onu.SerialNumber,
}).Debug("Sent Indication_OnuDiscInd")
@@ -69,19 +106,20 @@
// expected_onu_id: 1, received_onu_id: 1024, event: ONU-id-mismatch, can happen if both voltha and the olt rebooted
// so we're using the internal ID that is 1
// o.ID = msg.OnuID
- o.OperState = msg.OperState
+ o.OperState.Event("enable")
indData := &openolt.Indication_OnuInd{OnuInd: &openolt.OnuIndication{
IntfId: o.PonPortID,
OnuId: o.ID,
- OperState: o.OperState.String(),
- AdminState: o.OperState.String(),
+ OperState: o.OperState.Current(),
+ AdminState: o.OperState.Current(),
SerialNumber: o.SerialNumber,
}}
if err := stream.Send(&openolt.Indication{Data: indData}); err != nil {
log.Error("Failed to send Indication_OnuInd: %v", err)
}
- log.WithFields(log.Fields{
+ o.InternalState.Event("enable")
+ onuLogger.WithFields(log.Fields{
"IntfId": o.PonPortID,
"OnuId": o.ID,
"OperState": msg.OperState.String(),