bsc: Use c_l3_payload instead of random octetstring as l3 payload

OsmoBSC does some minimal parsing of l3 content to select MSC target,
match paging response to paging request, etc.
Since tests right now use potentially invalid data, osmo-bsc is not
rejecting conns providing invalid l3 content.

This commit is another step towards passing proper l3 data to osmo-bsc
in TTCN3 tests.

Related: SYS#6280
Change-Id: I012dbdc673ff98a6647280ce3d0245abff86cfa4

1 files changed, 10 insertions, 14 deletions

diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index de5b390b..aebb64c6 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -2581,17 +2581,16 @@ runs on test_CT {
 
 /* Check if we get SAPI N Reject on receipt of unexpected RLL RELease INDication */
 testcase TC_rll_rel_ind_sapi_n_reject() runs on test_CT {
-	var octetstring rnd_data := f_rnd_octstring(16);
 	var RSL_Message rx_rsl;
 	var DchanTuple dt;
 
 	f_init(1);
 
 	/* MS establishes a SAPI=0 link on DCCH */
-	dt := f_est_dchan(f_rnd_ra_cs(), 23, rnd_data);
+	dt := f_est_dchan(f_rnd_ra_cs(), 23, c_l3_payload);
 
 	/* MSC sends some data on (not yet established) SAPI=3 link */
-	BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSAP_DTAP(rnd_data, '03'O)));
+	BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSAP_DTAP(c_l3_payload, '03'O)));
 	/* BSC attempts to establish a SAPI=3 link on DCCH */
 	rx_rsl := f_exp_ipa_rx(tr_RSL_EST_REQ(dt.rsl_chan_nr, tr_RslLinkID_DCCH(3)));
 
@@ -2609,17 +2608,16 @@ testcase TC_rll_rel_ind_sapi_n_reject() runs on test_CT {
 
 /* Check if we get SAPI N Reject on receipt of unexpected RLL ERROR INDication */
 testcase TC_rll_err_ind_sapi_n_reject() runs on test_CT {
-	var octetstring rnd_data := f_rnd_octstring(16);
 	var RSL_Message rx_rsl;
 	var DchanTuple dt;
 
 	f_init(1);
 
 	/* MS establishes a SAPI=0 link on DCCH */
-	dt := f_est_dchan(f_rnd_ra_cs(), 23, rnd_data);
+	dt := f_est_dchan(f_rnd_ra_cs(), 23, c_l3_payload);
 
 	/* MSC sends some data on (not yet established) SAPI=3 link */
-	BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSAP_DTAP(rnd_data, '03'O)));
+	BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSAP_DTAP(c_l3_payload, '03'O)));
 	/* BSC attempts to establish a SAPI=3 link on DCCH */
 	rx_rsl := f_exp_ipa_rx(tr_RSL_EST_REQ(dt.rsl_chan_nr, tr_RslLinkID_DCCH(3)));
 
@@ -2637,17 +2635,16 @@ testcase TC_rll_err_ind_sapi_n_reject() runs on test_CT {
 
 /* Check if we get SAPI N Reject due to a SAPI=3 link establishment timeout */
 testcase TC_rll_timeout_sapi_n_reject() runs on test_CT {
-	var octetstring rnd_data := f_rnd_octstring(16);
 	var RSL_Message rx_rsl;
 	var DchanTuple dt;
 
 	f_init(1);
 
 	/* MS establishes a SAPI=0 link on DCCH */
-	dt := f_est_dchan(f_rnd_ra_cs(), 23, rnd_data);
+	dt := f_est_dchan(f_rnd_ra_cs(), 23, c_l3_payload);
 
 	/* MSC sends some data on (not yet established) SAPI=3 link */
-	BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSAP_DTAP(rnd_data, '03'O)));
+	BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSAP_DTAP(c_l3_payload, '03'O)));
 	/* BSC attempts to establish a SAPI=3 link on DCCH */
 	rx_rsl := f_exp_ipa_rx(tr_RSL_EST_REQ(dt.rsl_chan_nr, tr_RslLinkID_DCCH(3)));
 
@@ -2663,17 +2660,16 @@ testcase TC_rll_timeout_sapi_n_reject() runs on test_CT {
 
 /* Check DLCI CC (Control Channel type) bits in SAPI N Reject */
 testcase TC_rll_sapi_n_reject_dlci_cc() runs on test_CT {
-	var octetstring rnd_data := f_rnd_octstring(16);
 	var RSL_Message rx_rsl;
 	var DchanTuple dt;
 
 	f_init(1);
 
 	/* MS establishes a SAPI=0 link on DCCH */
-	dt := f_est_dchan(f_rnd_ra_cs(), 23, rnd_data);
+	dt := f_est_dchan(f_rnd_ra_cs(), 23, c_l3_payload);
 
 	/* MSC sends some data on (not yet established) SAPI=3 link */
-	BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSAP_DTAP(rnd_data, '03'O)));
+	BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSAP_DTAP(c_l3_payload, '03'O)));
 	/* BSC attempts to establish a SAPI=3 link on DCCH */
 	rx_rsl := f_exp_ipa_rx(tr_RSL_EST_REQ(dt.rsl_chan_nr, tr_RslLinkID_DCCH(3)));
 
@@ -9619,7 +9615,7 @@ testcase TC_fh_params_assignment_cmd() runs on test_CT {
 	 * NOTE: only 3 SDCCH/4 channels are available on CCCH+SDCCH4+CBCH */
 	for (var integer i := 0; i < 3; i := i + 1) {
 		/* Establish a dedicated channel, so we can trigger (late) TCH assignment */
-		var DchanTuple dt := f_est_dchan(f_rnd_ra_cs(), 23, f_rnd_octstring(16));
+		var DchanTuple dt := f_est_dchan(f_rnd_ra_cs(), 23, c_l3_payload);
 
 		/* Send a BSSMAP Assignment Command, expect CHANnel ACTIVation */
 		BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ass_cmd));
@@ -9685,7 +9681,7 @@ runs on test_CT {
 	var DchanTuple dt;
 
 	/* Establish a dedicated channel, so we can trigger handover */
-	dt := f_est_dchan(f_rnd_ra_cs(), 23, f_rnd_octstring(16));
+	dt := f_est_dchan(f_rnd_ra_cs(), 23, c_l3_payload);
 	f_sleep(0.5);
 
 	/* Trigger handover from BTS0 to BTS1 */