[SEBA-843] Storing PortNo in the ONU Device struct so that it can be passed with the packetIndications
Change-Id: I28e0bf5721d11fc52d70c6072a6cf70586ba5f98
diff --git a/internal/bbsim/responders/dhcp/dhcp.go b/internal/bbsim/responders/dhcp/dhcp.go
index 64e83dd..c7ae75c 100644
--- a/internal/bbsim/responders/dhcp/dhcp.go
+++ b/internal/bbsim/responders/dhcp/dhcp.go
@@ -194,7 +194,7 @@
return 0, errors.New("Failed to extract MsgType from dhcp")
}
-func sendDHCPPktIn(msg bbsim.ByteMsg, stream openolt.Openolt_EnableIndicationServer) error {
+func sendDHCPPktIn(msg bbsim.ByteMsg, portNo uint32, stream bbsim.Stream) error {
// FIXME unify sendDHCPPktIn and sendEapolPktIn methods
gemid, err := GetGemPortId(msg.IntfId, msg.OnuId)
if err != nil {
@@ -205,7 +205,11 @@
return err
}
data := &openolt.Indication_PktInd{PktInd: &openolt.PacketIndication{
- IntfType: "pon", IntfId: msg.IntfId, GemportId: uint32(gemid), Pkt: msg.Bytes,
+ IntfType: "pon",
+ IntfId: msg.IntfId,
+ GemportId: uint32(gemid),
+ Pkt: msg.Bytes,
+ PortNo: portNo,
}}
if err := stream.Send(&openolt.Indication{Data: data}); err != nil {
@@ -215,7 +219,7 @@
return nil
}
-func sendDHCPRequest(ponPortId uint32, onuId uint32, serialNumber string, onuHwAddress net.HardwareAddr, cTag int, stream openolt.Openolt_EnableIndicationServer) error {
+func sendDHCPRequest(ponPortId uint32, onuId uint32, serialNumber string, portNo uint32, onuHwAddress net.HardwareAddr, cTag int, stream openolt.Openolt_EnableIndicationServer) error {
dhcp := createDHCPReq(ponPortId, onuId)
pkt, err := serializeDHCPPacket(ponPortId, onuId, onuHwAddress, dhcp)
@@ -232,7 +236,7 @@
Bytes: pkt,
}
- if err := sendDHCPPktIn(msg, stream); err != nil {
+ if err := sendDHCPPktIn(msg, portNo, stream); err != nil {
return err
}
dhcpLogger.WithFields(log.Fields{
@@ -255,7 +259,7 @@
return nil
}
-func SendDHCPDiscovery(ponPortId uint32, onuId uint32, serialNumber string, onuStateMachine *fsm.FSM, onuHwAddress net.HardwareAddr, cTag int, stream openolt.Openolt_EnableIndicationServer) error {
+func SendDHCPDiscovery(ponPortId uint32, onuId uint32, serialNumber string, portNo uint32, onuStateMachine *fsm.FSM, onuHwAddress net.HardwareAddr, cTag int, stream bbsim.Stream) error {
dhcp := createDHCPDisc(ponPortId, onuId)
pkt, err := serializeDHCPPacket(ponPortId, onuId, onuHwAddress, dhcp)
if err != nil {
@@ -271,7 +275,7 @@
Bytes: pkt,
}
- if err := sendDHCPPktIn(msg, stream); err != nil {
+ if err := sendDHCPPktIn(msg, portNo, stream); err != nil {
if err := updateDhcpFailed(onuId, ponPortId, serialNumber, onuStateMachine); err != nil {
return err
}
@@ -293,7 +297,7 @@
return nil
}
-func HandleNextPacket(onuId uint32, ponPortId uint32, serialNumber string, onuHwAddress net.HardwareAddr, cTag int, onuStateMachine *fsm.FSM, pkt gopacket.Packet, stream openolt.Openolt_EnableIndicationServer) error {
+func HandleNextPacket(onuId uint32, ponPortId uint32, serialNumber string, portNo uint32, onuHwAddress net.HardwareAddr, cTag int, onuStateMachine *fsm.FSM, pkt gopacket.Packet, stream openolt.Openolt_EnableIndicationServer) error {
dhcpLayer, err := getDhcpLayer(pkt)
if err != nil {
@@ -322,7 +326,7 @@
if dhcpLayer.Operation == layers.DHCPOpReply {
if dhcpMessageType == layers.DHCPMsgTypeOffer {
- if err := sendDHCPRequest(ponPortId, onuId, serialNumber, onuHwAddress, cTag, stream); err != nil {
+ if err := sendDHCPRequest(ponPortId, onuId, serialNumber, portNo, onuHwAddress, cTag, stream); err != nil {
dhcpLogger.WithFields(log.Fields{
"OnuId": onuId,
"IntfId": ponPortId,
diff --git a/internal/bbsim/responders/dhcp/dhcp_test.go b/internal/bbsim/responders/dhcp/dhcp_test.go
index 0733cc0..6aa8060 100644
--- a/internal/bbsim/responders/dhcp/dhcp_test.go
+++ b/internal/bbsim/responders/dhcp/dhcp_test.go
@@ -27,7 +27,6 @@
)
// MOCKS
-var calledSend = 0
var dhcpStateMachine = fsm.NewFSM(
"dhcp_started",
@@ -42,49 +41,55 @@
type mockStreamSuccess struct {
grpc.ServerStream
+ CallCount int
+ Calls map[int]*openolt.PacketIndication
+ fail bool
}
-func (s mockStreamSuccess) Send(ind *openolt.Indication) error {
- calledSend++
+func (s *mockStreamSuccess) Send(ind *openolt.Indication) error {
+ s.CallCount++
+ if s.fail {
+ return errors.New("fake-error")
+ }
+ s.Calls[s.CallCount] = ind.GetPktInd()
return nil
}
-type mockStreamError struct {
- grpc.ServerStream
-}
-
-func (s mockStreamError) Send(ind *openolt.Indication) error {
- calledSend++
- return errors.New("stream-error")
-}
-
// TESTS
func TestSendDHCPDiscovery(t *testing.T) {
- calledSend = 0
dhcpStateMachine.SetState("dhcp_started")
+ var onuId uint32 = 1
+ var gemPortId uint16 = 1
+ var ponPortId uint32 = 0
+ var serialNumber = "BBSM00000001"
+ var mac = net.HardwareAddr{0x2e, 0x60, 0x70, 0x13, byte(ponPortId), byte(onuId)}
+ var portNo uint32 = 16
+
// Save current function and restore at the end:
old := GetGemPortId
defer func() { GetGemPortId = old }()
GetGemPortId = func(intfId uint32, onuId uint32) (uint16, error) {
- return 1, nil
+ return gemPortId, nil
}
- var onuId uint32 = 1
- var ponPortId uint32 = 0
- var serialNumber string = "BBSM00000001"
- var mac = net.HardwareAddr{0x2e, 0x60, 0x70, 0x13, byte(ponPortId), byte(onuId)}
+ stream := &mockStreamSuccess{
+ Calls: make(map[int]*openolt.PacketIndication),
+ fail: false,
+ }
- stream := mockStreamSuccess{}
-
- if err := SendDHCPDiscovery(ponPortId, onuId, serialNumber, dhcpStateMachine, mac, 1, stream); err != nil {
+ if err := SendDHCPDiscovery(ponPortId, onuId, serialNumber, portNo, dhcpStateMachine, mac, 1, stream); err != nil {
t.Errorf("SendDHCPDiscovery returned an error: %v", err)
t.Fail()
}
- assert.Equal(t, calledSend, 1)
+ assert.Equal(t, stream.CallCount, 1)
+ assert.Equal(t, stream.Calls[1].PortNo, portNo)
+ assert.Equal(t, stream.Calls[1].IntfId, ponPortId)
+ assert.Equal(t, stream.Calls[1].IntfType, "pon")
+ assert.Equal(t, stream.Calls[1].GemportId, uint32(gemPortId))
assert.Equal(t, dhcpStateMachine.Current(), "dhcp_discovery_sent")
}