Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
320 changes: 167 additions & 153 deletions core/integration/bookkeeping/protos/bkcommon.pb.go

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions core/integration/bookkeeping/protos/bkcommon.proto
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ message Run {
optional int64 timeTrgStart = 21;
// Trigger value
optional string triggerValue = 22;
optional string rawCtpTriggerConfiguration = 32;
// The full name or file location of the odcTopology
optional string odcTopologyFullName = 23;
optional bool ddFlp = 24;
Expand Down
174 changes: 94 additions & 80 deletions core/integration/bookkeeping/protos/run.pb.go

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions core/integration/bookkeeping/protos/run.proto
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ message RunUpdateRequest {
optional int64 timeTrgStart = 5;
optional int64 timeTrgEnd = 6;
optional string triggerValue = 7;
optional string rawCtpTriggerConfiguration = 19;
optional string pdpConfigOption = 8;
optional string pdpTopologyDescriptionLibraryFile = 9;
optional string tfbDdMode = 10;
Expand All @@ -65,6 +66,7 @@ message RunUpdateRequest {
// Optional users that stopped or started the run (can also be undefined)
optional User userO2Start = 17;
optional User userO2Stop = 18;
// 19 is trigger raw configuration
}

// Enums
Expand Down
2 changes: 1 addition & 1 deletion core/integration/bookkeeping/protos/run_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

428 changes: 229 additions & 199 deletions core/integration/odc/protos/odc.pb.go

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions core/integration/odc/protos/odc.proto
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ message GeneralReply {
string state = 7; // If successful and applicable to a request then contains an aggregated FairMQ device state, otherwise UNDEFINED.
uint64 runnr = 8; // Run number from ECS (optional)
repeated string hosts = 9; // Where applicable, provides a list of used hosts (Submit/Run requests)
string rmsjobids = 10; // Where applicable, provides a list of job IDs from the resource management system
}

// Device information
Expand All @@ -84,6 +85,8 @@ message Device {
string path = 3; // Runtime task path (same as in DDS)
bool ignored = 4; // Device was stopped and set to be ignored
string host = 5; // Host where the task runs
bool expendable = 6; // Device is expendable
string rmsjobid = 7; // job IDs from the resource management system
}

// Device change/get state request
Expand Down
77 changes: 47 additions & 30 deletions core/integration/odc/protos/odc_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.