[VOL-2778] Introducing Service definition in order to support the TT workflow
Change-Id: Ib171502e8940b5d0b219620a4503f7095d376d7a
diff --git a/internal/bbsim/responders/eapol/eapol_test.go b/internal/bbsim/responders/eapol/eapol_test.go
index 9f8ff22..824ce65 100644
--- a/internal/bbsim/responders/eapol/eapol_test.go
+++ b/internal/bbsim/responders/eapol/eapol_test.go
@@ -43,7 +43,7 @@
// params for the function under test
var onuId uint32 = 1
-var gemPortId uint16 = 1
+var gemPortId uint32 = 1
var ponPortId uint32 = 0
var serialNumber string = "BBSM00000001"
var macAddress = net.HardwareAddr{0x01, 0x80, 0xC2, 0x00, 0x00, 0x03}
@@ -70,20 +70,12 @@
func TestSendEapStartSuccess(t *testing.T) {
eapolStateMachine.SetState("auth_started")
- // Save current function and restore at the end:
- old := GetGemPortId
- defer func() { GetGemPortId = old }()
-
- GetGemPortId = func(intfId uint32, onuId uint32) (uint16, error) {
- return gemPortId, nil
- }
-
stream := &mockStream{
Calls: make(map[int]*openolt.PacketIndication),
fail: false,
}
- if err := SendEapStart(onuId, ponPortId, serialNumber, portNo, macAddress, eapolStateMachine, stream); err != nil {
+ if err := SendEapStart(onuId, ponPortId, serialNumber, portNo, macAddress, gemPortId, eapolStateMachine, stream); err != nil {
t.Errorf("SendEapStart returned an error: %v", err)
t.Fail()
}
@@ -98,35 +90,6 @@
}
-func TestSendEapStartFailNoGemPort(t *testing.T) {
- eapolStateMachine.SetState("auth_started")
-
- // Save current function and restore at the end:
- old := GetGemPortId
- defer func() { GetGemPortId = old }()
-
- GetGemPortId = func(intfId uint32, onuId uint32) (uint16, error) {
- return 0, errors.New("no-gem-port")
- }
-
- var macAddress = net.HardwareAddr{0x01, 0x80, 0xC2, 0x00, 0x00, 0x03}
-
- stream := &mockStream{
- Calls: make(map[int]*openolt.PacketIndication),
- fail: false,
- }
-
- err := SendEapStart(onuId, ponPortId, serialNumber, portNo, macAddress, eapolStateMachine, stream)
- if err == nil {
- t.Errorf("SendEapStart did not return an error")
- t.Fail()
- }
-
- assert.Equal(t, err.Error(), "no-gem-port")
-
- assert.Equal(t, eapolStateMachine.Current(), "auth_failed")
-}
-
func TestSendEapStartFailStreamError(t *testing.T) {
eapolStateMachine.SetState("auth_started")
@@ -144,7 +107,7 @@
fail: true,
}
- err := SendEapStart(onuId, ponPortId, serialNumber, portNo, macAddress, eapolStateMachine, stream)
+ err := SendEapStart(onuId, ponPortId, serialNumber, portNo, macAddress, gemPortId, eapolStateMachine, stream)
if err == nil {
t.Errorf("SendEapStart did not return an error")
t.Fail()