Cleanup
Change-Id: Iceb908751e93e7d42de5f06942092599b1a5509d
diff --git a/internal/bbsim/devices/olt.go b/internal/bbsim/devices/olt.go
index 33126a8..2d46ced 100644
--- a/internal/bbsim/devices/olt.go
+++ b/internal/bbsim/devices/olt.go
@@ -36,9 +36,24 @@
"module": "OLT",
})
-func init() {
- //log.SetReportCaller(true)
- log.SetLevel(log.DebugLevel)
+type OltDevice struct {
+ // BBSIM Internals
+ ID int
+ SerialNumber string
+ NumNni int
+ NumPon int
+ NumOnuPerPon int
+ InternalState *fsm.FSM
+ channel chan Message
+ oltDoneChannel *chan bool
+ apiDoneChannel *chan bool
+ nniPktInChannel chan *bbsim.PacketMsg
+
+ Pons []PonPort
+ Nnis []NniPort
+
+ // OLT Attributes
+ OperState *fsm.FSM
}
var olt = OltDevice{}
@@ -561,19 +576,6 @@
}
onu.Channel <- msg
- //etherType := rawpkt.Layer(layers.LayerTypeEthernet).(*layers.Ethernet).EthernetType
- //
- //if etherType == layers.EthernetTypeEAPOL {
- // eapolPkt := bbsim.ByteMsg{IntfId: onuPkt.IntfId, OnuId: onuPkt.OnuId, Bytes: rawpkt.Data()}
- // onu.eapolPktOutCh <- &eapolPkt
- //} else if layerDHCP := rawpkt.Layer(layers.LayerTypeDHCPv4); layerDHCP != nil {
- // // TODO use IsDhcpPacket
- // // TODO we need to untag the packets
- // // NOTE here we receive packets going from the DHCP Server to the ONU
- // // for now we expect them to be double-tagged, but ideally the should be single tagged
- // dhcpPkt := bbsim.ByteMsg{IntfId: onuPkt.IntfId, OnuId: onuPkt.OnuId, Bytes: rawpkt.Data()}
- // onu.dhcpPktOutCh <- &dhcpPkt
- //}
return new(openolt.Empty), nil
}