[VOL-3880] Correctly reporting software image status in OMCI Get
[VOL-3900] OMCI ONU Software Image Download
Change-Id: I8d91be832f3a89404d0af0dd98e6b53359e6a738
diff --git a/internal/bbsim/devices/onu_state_machine_test.go b/internal/bbsim/devices/onu_state_machine_test.go
index b48b286..6f62540 100644
--- a/internal/bbsim/devices/onu_state_machine_test.go
+++ b/internal/bbsim/devices/onu_state_machine_test.go
@@ -28,13 +28,13 @@
_ = onu.InternalState.Event("discover")
assert.Equal(t, onu.InternalState.Current(), "discovered")
_ = onu.InternalState.Event("enable")
- assert.Equal(t, onu.InternalState.Current(), "enabled")
+ assert.Equal(t, onu.InternalState.Current(), OnuStateEnabled)
}
func Test_Onu_StateMachine_disable(t *testing.T) {
onu := createTestOnu()
- onu.InternalState.SetState("enabled")
- assert.Equal(t, onu.InternalState.Current(), "enabled")
+ onu.InternalState.SetState(OnuStateEnabled)
+ assert.Equal(t, onu.InternalState.Current(), OnuStateEnabled)
onu.PortNo = 16
onu.GemPortAdded = true
@@ -43,8 +43,8 @@
{ID: 2, Direction: "downstream"},
}
- _ = onu.InternalState.Event("disable")
- assert.Equal(t, onu.InternalState.Current(), "disabled")
+ _ = onu.InternalState.Event(OnuTxDisable)
+ assert.Equal(t, onu.InternalState.Current(), OnuStateDisabled)
assert.Equal(t, onu.GemPortAdded, false)
assert.Equal(t, onu.PortNo, uint32(0))
@@ -58,15 +58,15 @@
t.Skip("Needs to be moved in the Service struct")
onu := createTestOnu()
- onu.InternalState.SetState("enabled")
- assert.Equal(t, onu.InternalState.Current(), "enabled")
+ onu.InternalState.SetState(OnuStateEnabled)
+ assert.Equal(t, onu.InternalState.Current(), OnuStateEnabled)
// fail as no EapolFlow has been received
err := onu.InternalState.Event("start_auth")
if err == nil {
t.Fatal("can't start EAPOL without EapolFlow")
}
- assert.Equal(t, onu.InternalState.Current(), "enabled")
+ assert.Equal(t, onu.InternalState.Current(), OnuStateEnabled)
assert.Equal(t, err.Error(), "transition canceled with error: cannot-go-to-auth-started-as-eapol-flow-is-missing")
}
@@ -74,15 +74,15 @@
t.Skip("Needs to be moved in the Service struct")
onu := createTestOnu()
- onu.InternalState.SetState("enabled")
- assert.Equal(t, onu.InternalState.Current(), "enabled")
+ onu.InternalState.SetState(OnuStateEnabled)
+ assert.Equal(t, onu.InternalState.Current(), OnuStateEnabled)
// fail has no GemPort has been set
err := onu.InternalState.Event("start_auth")
if err == nil {
t.Fatal("can't start EAPOL without GemPort")
}
- assert.Equal(t, onu.InternalState.Current(), "enabled")
+ assert.Equal(t, onu.InternalState.Current(), OnuStateEnabled)
assert.Equal(t, err.Error(), "transition canceled with error: cannot-go-to-auth-started-as-gemport-is-missing")
}
@@ -91,8 +91,8 @@
t.Skip("Needs to be moved in the Service struct")
onu := createTestOnu()
- onu.InternalState.SetState("enabled")
- assert.Equal(t, onu.InternalState.Current(), "enabled")
+ onu.InternalState.SetState(OnuStateEnabled)
+ assert.Equal(t, onu.InternalState.Current(), OnuStateEnabled)
// succeed
onu.GemPortAdded = true
@@ -133,14 +133,14 @@
t.Skip("Needs to be moved in the Service struct")
onu := createTestOnu()
- onu.InternalState.SetState("enabled")
- assert.Equal(t, onu.InternalState.Current(), "enabled")
+ onu.InternalState.SetState(OnuStateEnabled)
+ assert.Equal(t, onu.InternalState.Current(), OnuStateEnabled)
err := onu.InternalState.Event("start_dhcp")
if err == nil {
t.Fail()
}
- assert.Equal(t, onu.InternalState.Current(), "enabled")
+ assert.Equal(t, onu.InternalState.Current(), OnuStateEnabled)
assert.Equal(t, err.Error(), "transition canceled with error: cannot-go-to-dhcp-started-as-authentication-is-required")
}