fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42392?usp=email )

Change subject: library/GSM_RR_Types: add send/receive variants for t_RrL3Header ......................................................................

library/GSM_RR_Types: add send/receive variants for t_RrL3Header

Change-Id: I35e5897470154f0a868fead4800a46849585a201 --- M bsc/BSC_Tests.ttcn M library/GSM_RR_Types.ttcn 2 files changed, 11 insertions(+), 4 deletions(-)

Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve

diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index ef02faf..17f2326 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -10154,7 +10154,7 @@

/* Decode the L3 message and make sure it is (RR) Assignment Command */ var GsmRrL3Message l3_msg := dec_GsmRrL3Message(ie.l3_info.payload); - if (not match(l3_msg.header, t_RrL3Header(ASSIGNMENT_COMMAND))) { + if (not match(l3_msg.header, tr_RrL3Header(ASSIGNMENT_COMMAND))) { setverdict(fail, "Failed to match Assignment Command: ", l3_msg); continue; } @@ -10224,7 +10224,7 @@

/* Decode the L3 message and make sure it is (RR) Handover Command */ var GsmRrL3Message l3_msg := dec_GsmRrL3Message(ie.l3_info.payload); - if (not match(l3_msg.header, t_RrL3Header(HANDOVER_COMMAND))) { + if (not match(l3_msg.header, tr_RrL3Header(HANDOVER_COMMAND))) { setverdict(fail, "Failed to match Handover Command: ", l3_msg); return; } diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index 963ad0c..3dc1cd5 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -205,7 +205,14 @@ RrMessageType message_type } with { variant "" };

- template RrL3Header t_RrL3Header(RrMessageType msg_type) := { + template (value) RrL3Header + ts_RrL3Header(template (value) RrMessageType msg_type) := { + skip_indicator := 0, + rr_protocol_discriminator := 6, + message_type := msg_type + } + template (present) RrL3Header + tr_RrL3Header(template (present) RrMessageType msg_type := ?) := { skip_indicator := 0, rr_protocol_discriminator := 6, message_type := msg_type @@ -897,7 +904,7 @@

template (value) GsmRrL3Message ts_MEAS_REP(template (value) MeasurementResults meas_res := ts_MeasurementResults) := { - header := t_RrL3Header(MEASUREMENT_REPORT), + header := ts_RrL3Header(MEASUREMENT_REPORT), payload := { meas_rep := { meas_res := meas_res