Change in osmo-ttcn3-hacks[master]: BTS_Tests_SMSCB: use existing tr_PAG_REQ1 and t_MI_NoIdentity

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17643 )

Change subject: BTS_Tests_SMSCB: use existing tr_PAG_REQ1 and t_MI_NoIdentity
......................................................................

BTS_Tests_SMSCB: use existing tr_PAG_REQ1 and t_MI_NoIdentity

Change-Id: I018e1d875c85fe3958fd184fe0d2b0f56d1e343a
---
M bts/BTS_Tests_SMSCB.ttcn
1 file changed, 3 insertions(+), 29 deletions(-)

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



diff --git a/bts/BTS_Tests_SMSCB.ttcn b/bts/BTS_Tests_SMSCB.ttcn
index ebd8d0f..08e1cef 100644
--- a/bts/BTS_Tests_SMSCB.ttcn
+++ b/bts/BTS_Tests_SMSCB.ttcn
@@ -23,6 +23,7 @@
 import from LAPDm_Types all;
 import from IPA_Emulation all;
 import from GSM_RR_Types all;
+import from L3_Templates all;
 
 import from RSL_Types all;
 
@@ -884,33 +885,6 @@
 	payload :=?
 };
 
-private template GsmRrMessage tr_PagingType1_empty := {
-	header := t_RrHeader(PAGING_REQUEST_TYPE_1, 5),
-	payload := {
-		pag_req_1 := {
-			chan_needed := {
-				second := CHAN_NEED_ANY,
-				first := CHAN_NEED_ANY
-			},
-			page_mode := PAGE_MODE_NORMAL,
-			mi1 := {
-				lengthIndicator := 1,
-				mobileIdentityV := {
-					typeOfIdentity := '000'B,
-					oddEvenInd_identity := {
-						no_identity := {
-							oddevenIndicator := '0'B,
-							fillerDigits := 'F'H
-						}
-					}
-				}
-			},
-			mi2 := omit,
-			rest_octets := ?
-		}
-	}
-};
-
 /* we expect four blocks of 14 bytes, let's fill them with content easily distinguishable */
 const octetstring c_etws_seg0 := '000102030405060708090a0b0c0d'O;
 const octetstring c_etws_seg1 := '101112131415161718191a1b1c1d'O;
@@ -941,7 +915,7 @@
 	[] L1CTL.receive(tr_L1CTL_DATA_IND(t_chan_nr)) -> value dl {
 		var GsmRrMessage l3 := dec_GsmRrMessage(dl.payload.data_ind.payload);
 		select (l3) {
-		case (tr_PagingType1_empty) {
+		case (tr_PAG_REQ1(tr_MI_LV(t_MI_NoIdentity()))) {
 			var octetstring p1ro := l3.payload.pag_req_1.rest_octets;
 			var bitstring midamble := oct2bit(substr(p1ro, 0, 3));
 			var octetstring segment := substr(p1ro, 3, lengthof(p1ro)-3);
@@ -1037,7 +1011,7 @@
 	[] L1CTL.receive(tr_L1CTL_DATA_IND(t_chan_nr)) -> value dl {
 		var GsmRrMessage l3 := dec_GsmRrMessage(dl.payload.data_ind.payload);
 		select (l3) {
-		case (tr_PagingType1_empty) { repeat; }
+		case (tr_PAG_REQ1(tr_MI_LV(t_MI_NoIdentity()))) { repeat; }
 		case (tr_PagingType1) {
 			setverdict(fail, "Received non-empty PT1 after disabling ETWS PN: ", l3);
 			}

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17643
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: I018e1d875c85fe3958fd184fe0d2b0f56d1e343a
Gerrit-Change-Number: 17643
Gerrit-PatchSet: 4
Gerrit-Owner: fixeria <axilirator at gmail.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200329/d86efa52/attachment.htm>