[core] Send run number in ODC Start/Stop calls

Author: teo

core/integration/odc/handlers.go

@@ -90,13 +90,15 @@ func handleGetState(ctx context.Context, odcClient *RpcClient, envId string) (st
 	return odcutils.StateForOdcState(newState), err
 }
 
-func handleStart(ctx context.Context, odcClient *RpcClient, arguments map[string]string, envId string) error {
+func handleStart(ctx context.Context, odcClient *RpcClient, arguments map[string]string, envId string, runNumber uint64) error {
 	defer utils.TimeTrackFunction(time.Now(), log.WithPrefix("odcclient").WithField("partition", envId))
+
 	req := &odcpb.StartRequest{
 		Request:              &odcpb.StateRequest{
 			Partitionid: envId,
 			Path:     "",
 			Detailed: false,
+			Runnr: runNumber,
 		},
 	}
 
@@ -181,13 +183,14 @@ func handleStart(ctx context.Context, odcClient *RpcClient, arguments map[string
 	return err
 }
 
-func handleStop(ctx context.Context, odcClient *RpcClient, arguments map[string]string, envId string) error {
+func handleStop(ctx context.Context, odcClient *RpcClient, arguments map[string]string, envId string, runNumber uint64) error {
 	defer utils.TimeTrackFunction(time.Now(), log.WithPrefix("odcclient").WithField("partition", envId))
 	req := &odcpb.StopRequest{
 		Request:              &odcpb.StateRequest{
 			Partitionid: envId,
 			Path:     "",
 			Detailed: false,
+			Runnr: runNumber,
 		},
 	}
 
@@ -382,7 +385,7 @@ func handleCleanup(ctx context.Context, odcClient *RpcClient, arguments map[stri
 func doReset(ctx context.Context, odcClient *RpcClient, arguments map[string]string, envId string) error {
 	// RESET
 	req := &odcpb.ResetRequest{
-		Request:              &odcpb.StateRequest{
+		Request: &odcpb.StateRequest{
 			Partitionid: envId,
 			Path:     "",
 			Detailed: false,

core/integration/odc/plugin.go

@@ -219,6 +219,18 @@ func (p *Plugin) ObjectStack(data interface{}) (stack map[string]interface{}) {
 				WithField("call", "Start").
 				Warn("cannot acquire run number for ODC")
 		}
+		var (
+			runNumberu64 uint64
+			err error
+		)
+
+		runNumberu64, err = strconv.ParseUint(rn, 10, 32)
+		if err != nil {
+			log.WithField("partition", envId).
+				WithError(err).
+				Error("cannot acquire run number for DCS SOR")
+			runNumberu64 = 0
+		}
 
 		timeout := callable.AcquireTimeout(ODC_START_TIMEOUT, varStack, "Start", envId)
 
@@ -228,7 +240,7 @@ func (p *Plugin) ObjectStack(data interface{}) (stack map[string]interface{}) {
 
 		ctx, cancel := context.WithTimeout(context.Background(), timeout)
 		defer cancel()
-		err := handleStart(ctx, p.odcClient, arguments, envId)
+		err = handleStart(ctx, p.odcClient, arguments, envId, runNumberu64)
 		if err != nil {
 			log.WithError(err).
 				WithField("level", infologger.IL_Support).
@@ -244,11 +256,30 @@ func (p *Plugin) ObjectStack(data interface{}) (stack map[string]interface{}) {
 	stack["Stop"] = func() (out string) {
 		// ODC Stop
 
+		rn, ok := varStack["run_number"]
+		if !ok {
+			log.WithField("partition", envId).
+				WithField("call", "Start").
+				Warn("cannot acquire run number for ODC")
+		}
+		var (
+			runNumberu64 uint64
+			err error
+		)
+
+		runNumberu64, err = strconv.ParseUint(rn, 10, 32)
+		if err != nil {
+			log.WithField("partition", envId).
+				WithError(err).
+				Error("cannot acquire run number for DCS SOR")
+			runNumberu64 = 0
+		}
+
 		timeout := callable.AcquireTimeout(ODC_STOP_TIMEOUT, varStack, "Stop", envId)
 
 		ctx, cancel := context.WithTimeout(context.Background(), timeout)
 		defer cancel()
-		err := handleStop(ctx, p.odcClient, nil, envId)
+		err = handleStop(ctx, p.odcClient, nil, envId, runNumberu64)
 		if err != nil {
 			log.WithError(err).
 				WithField("level", infologger.IL_Support).