[occ][executor] Handle COMPLETE_INIT transition explicitly

Therefore INITIALIZING_DEVICE is not an intermediate state any more,
from the OCC point of view.

Author: teo

executor/executorcmd/transitioner/fairmq.go

@@ -114,7 +114,13 @@ func (cm *FairMQ) stateForFmqState(fmqStateName string) string {
 
 func (cm *FairMQ) doConfigure(evt string, src string, dst string, args map[string]string) (finalState string, err error) {
 	var state string
-	state, err = cm.DoTransition(EventInfo{fairmq.EvtINIT_DEVICE, cm.fmqStateForState(src), fairmq.INITIALIZED, args})
+	state, err = cm.DoTransition(EventInfo{fairmq.EvtINIT_DEVICE, cm.fmqStateForState(src), fairmq.INITIALIZING_DEVICE, args})
+	if state != fairmq.INITIALIZING_DEVICE {
+		finalState = cm.stateForFmqState(state)
+		return
+	}
+
+	state, err = cm.DoTransition(EventInfo{fairmq.EvtCOMPLETE_INIT, fairmq.INITIALIZING_DEVICE, fairmq.INITIALIZED, nil})
 	if state != fairmq.INITIALIZED {
 		finalState = cm.stateForFmqState(state)
 		return

executor/executorcmd/transitioner/fairmq/states.go

@@ -25,13 +25,14 @@
 package fairmq
 
 const(
-	OK           = "OK"
-	ERROR        = "ERROR"
-	IDLE         = "IDLE"
-	INITIALIZED  = "INITIALIZED"
-	BOUND        = "BOUND"
-	DEVICE_READY = "DEVICE READY"
-	READY        = "READY"
-	RUNNING      = "RUNNING"
-	EXITING      = "EXITING"
+	OK                  = "OK"
+	ERROR               = "ERROR"
+	IDLE                = "IDLE"
+	INITIALIZING_DEVICE = "INITIALIZING DEVICE"
+	INITIALIZED         = "INITIALIZED"
+	BOUND               = "BOUND"
+	DEVICE_READY        = "DEVICE READY"
+	READY               = "READY"
+	RUNNING             = "RUNNING"
+	EXITING             = "EXITING"
 )

executor/executorcmd/transitioner/fairmq/transitions.go

@@ -25,14 +25,15 @@
 package fairmq
 
 const(
-	EvtAUTO         = "Auto"
-	EvtINIT_DEVICE  = "INIT DEVICE"
-	EvtBIND         = "BIND"
-	EvtCONNECT      = "INITIALIZED"
-	EvtINIT_TASK    = "INIT TASK"
-	EvtRUN          = "RUN"
-	EvtSTOP         = "STOP"
-	EvtRESET_TASK   = "RESET TASK"
-	EvtRESET_DEVICE = "RESET DEVICE"
-	EvtEND          = "END"
+	EvtAUTO          = "Auto"
+	EvtINIT_DEVICE   = "INIT DEVICE"
+	EvtCOMPLETE_INIT = "COMPLETE INIT"
+	EvtBIND          = "BIND"
+	EvtCONNECT       = "INITIALIZED"
+	EvtINIT_TASK     = "INIT TASK"
+	EvtRUN           = "RUN"
+	EvtSTOP          = "STOP"
+	EvtRESET_TASK    = "RESET TASK"
+	EvtRESET_DEVICE  = "RESET DEVICE"
+	EvtEND           = "END"
 )

occ/plugin/OccPluginServer.cxx

@@ -424,7 +424,7 @@ OccPluginServer::Transition(grpc::ServerContext* context,
 
 bool OccPluginServer::isIntermediateState(const std::string& state)
 {
-    return state.find("INITIALIZING") != std::string::npos ||
+    return state.find("INITIALIZING TASK") != std::string::npos ||
            state.find("RESETTING") != std::string::npos ||
            state.find("BINDING") != std::string::npos ||
            state.find("CONNECTING") != std::string::npos;