Change in ...osmo-ttcn3-hacks[master]: bts: BTS_Tests_LAPDm.ttcn: rename f_init() to f_lapdm_init()

Harald Welte gerrit-no-reply at lists.osmocom.org
Sat Jun 1 21:15:45 UTC 2019


Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14330


Change subject: bts: BTS_Tests_LAPDm.ttcn: rename f_init() to f_lapdm_init()
......................................................................

bts: BTS_Tests_LAPDm.ttcn: rename f_init() to f_lapdm_init()

This is to avoid name clashes with f_init() from BTS_Tests.ttcn

Change-Id: Ie6272165b1dbda53d2d02af43c8e969da7a54d2e
---
M bts/BTS_Tests_LAPDm.ttcn
1 file changed, 11 insertions(+), 7 deletions(-)



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

diff --git a/bts/BTS_Tests_LAPDm.ttcn b/bts/BTS_Tests_LAPDm.ttcn
index 0792863..33aa174 100644
--- a/bts/BTS_Tests_LAPDm.ttcn
+++ b/bts/BTS_Tests_LAPDm.ttcn
@@ -17,7 +17,11 @@
 type component lapdm_bts_CT extends lapdm_test_CT, test_CT {
 }
 
-function f_init() runs on lapdm_test_CT {
+/*********************************************************************************
+ * Test using only L1CTL/LAPDm
+ *********************************************************************************/
+
+function f_lapdm_init() runs on lapdm_test_CT {
 	/* create the LAPDm component */
 	lapdm_component := lapdm_CT.create;
 	/* connect our own LAPDM port to the LAPDM Service Provider of the LAPDm component */
@@ -144,7 +148,7 @@
 }
 
 testcase TC_sabm_ua_dcch_sapi0() runs on lapdm_test_CT {
-	f_init();
+	f_lapdm_init();
 	if (not f_test_sabm_results_in_ua(0, false, 'FEFE'O)) {
 		setverdict(fail);
 	}
@@ -152,7 +156,7 @@
 }
 
 testcase TC_sabm_ua_dcch_sapi0_nopayload() runs on lapdm_test_CT {
-	f_init();
+	f_lapdm_init();
 	if (f_test_sabm_results_in_ua(0, false, ''O)) {
 		setverdict(fail, "Initial SABM/UA must contain L3 payload but BTS accepts without");
 	}
@@ -160,7 +164,7 @@
 }
 
 testcase TC_sabm_ua_dcch_sapi3() runs on lapdm_test_CT {
-	f_init();
+	f_lapdm_init();
 	if (f_test_sabm_results_in_ua(3, false, 'FEFE'O)) {
 		setverdict(fail, "Initial SABM/UA must be on SAPI0, but BTS accepts SAPI=3");
 	}
@@ -168,7 +172,7 @@
 }
 
 testcase TC_sabm_ua_dcch_sapi4() runs on lapdm_test_CT {
-	f_init();
+	f_lapdm_init();
 	if (f_test_sabm_results_in_ua(4, false, 'FEFE'O)) {
 		setverdict(fail, "Initial SABM/UA must be on SAPI0, but BTS accepts SAPI=4");
 	}
@@ -182,7 +186,7 @@
 	const boolean use_sacch := false;
 	timer T := 5.0;
 
-	f_init();
+	f_lapdm_init();
 
 	f_establish_dcch();
 	/* first frame is our real SABM */
@@ -206,7 +210,7 @@
   * UA. This is required during the contention resolution procedure as specified in 8.4.1.4 */
 testcase TC_sabm_retransmit() runs on lapdm_test_CT {
 	const octetstring payload := '00FEFEDEADBEEF'O;
-	f_init();
+	f_lapdm_init();
 	if (not f_test_sabm_results_in_ua(0, false, payload)) {
 		setverdict(fail, "UA not received for first SABM");
 	}

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14330
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: Ie6272165b1dbda53d2d02af43c8e969da7a54d2e
Gerrit-Change-Number: 14330
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190601/0598ab29/attachment.html>


More information about the gerrit-log mailing list