Change in osmo-ttcn3-hacks[master]: pcu/GPRS_Components: get rid of meaningless bts_nr argument

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

fixeria gerrit-no-reply at lists.osmocom.org
Thu May 28 14:44:31 UTC 2020


Hello pespin,

I'd like you to do a code review. Please visit

    https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18544

to review the following change.


Change subject: pcu/GPRS_Components: get rid of meaningless bts_nr argument
......................................................................

pcu/GPRS_Components: get rid of meaningless bts_nr argument

We don't (yet) support multi-BTS test cases anyway. Ideally, each
virtual BTS would be a separate component with an individual port.

Change-Id: I8b639d179db259bf0e43cf1929447a44d5736f62
---
M pcu/GPRS_Components.ttcn
M pcu/PCU_Tests.ttcn
2 files changed, 6 insertions(+), 8 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/44/18544/1

diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn
index cbb6cda..1bda189 100644
--- a/pcu/GPRS_Components.ttcn
+++ b/pcu/GPRS_Components.ttcn
@@ -171,8 +171,7 @@
 
 function f_pcuif_rx_imm_ass(out GsmRrMessage rr_imm_ass,
 			    template PCUIF_Sapi sapi := PCU_IF_SAPI_AGCH,
-			    template GsmRrMessage t_imm_ass := ?,
-			    uint8_t bts_nr := 0)
+			    template GsmRrMessage t_imm_ass := ?)
 runs on MS_BTS_IFACE_CT return boolean {
 	var PCUIF_Message pcu_msg;
 	var octetstring data;
@@ -180,7 +179,7 @@
 
 	T.start(2.0);
 	alt {
-	[] BTS.receive(tr_PCUIF_DATA_REQ(bts_nr := bts_nr, trx_nr := 0, ts_nr := 0,
+	[] BTS.receive(tr_PCUIF_DATA_REQ(bts_nr := 0, trx_nr := 0, ts_nr := 0,
 					 sapi := sapi, data := ?)) -> value pcu_msg {
 		/* On PCH the payload is prefixed with paging group (3 octets): skip it.
 		 * TODO: add an additional template parameter, so we can match it. */
@@ -213,7 +212,7 @@
 const BIT8 chan_req_def := '01111000'B;
 
 /* Establish an Uplink TBF by sending RACH.ind towards the PCU */
-function f_establish_tbf(out GsmRrMessage rr_imm_ass, uint8_t bts_nr := 0,
+function f_establish_tbf(out GsmRrMessage rr_imm_ass,
 			 uint16_t ra := bit2int(chan_req_def),
 			 uint8_t is_11bit := 0,
 			 PCUIF_BurstType burst_type := BURST_TYPE_0,
@@ -226,7 +225,7 @@
 
 	/* Send RACH.ind */
 	log("Sending RACH.ind on fn=", fn, " with RA=", ra, ", TA=", ta);
-	BTS.send(ts_PCUIF_RACH_IND(bts_nr := bts_nr, trx_nr := 0, ts_nr := 0,
+	BTS.send(ts_PCUIF_RACH_IND(bts_nr := 0, trx_nr := 0, ts_nr := 0,
 				   ra := ra, is_11bit := is_11bit,
 				   burst_type := burst_type,
 				   fn := fn, arfcn := 871,
@@ -239,8 +238,7 @@
 
 	/* Expect Immediate (TBF) Assignment on TS0/AGCH */
 	return f_pcuif_rx_imm_ass(rr_imm_ass, PCU_IF_SAPI_AGCH,
-				  tr_IMM_TBF_ASS(false, ra, fn),
-				  bts_nr := bts_nr);
+				  tr_IMM_TBF_ASS(false, ra, fn));
 }
 
 function f_imm_ass_verify_ul_tbf_ass(in GsmRrMessage rr_imm_ass, out PacketUlAssign ul_tbf_ass, template PacketUlAssign ul_ass := tr_PacketUlDynAssign)
diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index 8a1a425..9e7c92b 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -263,7 +263,7 @@
 	 * at some point the PCU will fail to allocate a new TBF. */
 	for (var TimingAdvance ta := 0; ta < 64; ta := ta + 16) {
 		/* Establish an Uplink TBF (send RACH.ind with current TA) */
-		ok := f_establish_tbf(rr_msg, bts_nr := 0, ta := ta);
+		ok := f_establish_tbf(rr_msg, ta := ta);
 		if (not ok) {
 			setverdict(fail, "Failed to establish an Uplink TBF");
 			break;

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18544
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I8b639d179db259bf0e43cf1929447a44d5736f62
Gerrit-Change-Number: 18544
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <axilirator at gmail.com>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200528/a1c45152/attachment.htm>


More information about the gerrit-log mailing list