Skip to content

Commit b18f26d

Browse files
author
Michal Tichák
committed
[operator] fairmq states are better mapped
1 parent 8421f88 commit b18f26d

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

control-operator/internal/controller/fairmq_transition.go

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import (
3434

3535
// FairMQ internal state names as used by the OCC plugin
3636
const (
37+
fmqOK = "OK"
3738
fmqIdle = "IDLE"
3839
fmqInitializingDevice = "INITIALIZING DEVICE"
3940
fmqInitialized = "INITIALIZED"
@@ -42,6 +43,7 @@ const (
4243
fmqReady = "READY"
4344
fmqRunning = "RUNNING"
4445
fmqError = "ERROR"
46+
fmqExiting = "EXITING"
4547
)
4648

4749
// FairMQ transition event names as used by the OCC plugin
@@ -55,25 +57,25 @@ const (
5557
fmqEvtStop = "STOP"
5658
fmqEvtResetTask = "RESET TASK"
5759
fmqEvtResetDevice = "RESET DEVICE"
60+
fmqEvtEnd = "END"
61+
fmqEvtAuto = "Auto"
5862
)
5963

6064
// fmqToOCCState maps FairMQ internal states to lowercase OCC state names
6165
var fmqToOCCState = map[string]string{
62-
fmqIdle: "standby",
63-
fmqInitializingDevice: "standby",
64-
fmqInitialized: "standby",
65-
fmqBound: "standby",
66-
fmqDeviceReady: "standby",
67-
fmqReady: "configured",
68-
fmqRunning: "running",
69-
fmqError: "error",
66+
fmqIdle: "standby",
67+
fmqReady: "configured",
68+
fmqRunning: "running",
69+
fmqError: "error",
70+
fmqExiting: "done",
7071
}
7172

7273
func occStateForFmqState(fmqState string) string {
7374
if occ, ok := fmqToOCCState[strings.ToUpper(fmqState)]; ok {
7475
return occ
7576
}
76-
return "standby"
77+
// TODO: it might be better to do proper error handling for doFairMQStep when intermediate step fail
78+
return "not-mapped"
7779
}
7880

7981
// doFairMQStep sends a single FairMQ-level gRPC Transition and returns the

0 commit comments

Comments
 (0)