Change in osmo-ttcn3-hacks[master]: bsc: test Classmark Enquiry

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11012 )

Change subject: bsc: test Classmark Enquiry
......................................................................

bsc: test Classmark Enquiry

Enhance TC_classmark to also include the BSSMAP Classmark Request -> RR
Classmark Enquiry part. So far it was only testing the return path of RR
Classmark Change -> BSSMAP Classmark Update.

This test will thus fail with current osmo-bsc master, and will succeed as soon
as osmo-bsc If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf is merged.

Add:

* ts_BSSMAP_ClassmarkRequest in BSSMAP_Templates.ttcn
* tr_RRM_CM_ENQUIRY in L3_Templates.ttcn

Change-Id: Idaab4d568cf986b4897ba008f6262c839d1592fb
---
M bsc/BSC_Tests.ttcn
M library/BSSMAP_Templates.ttcn
M library/L3_Templates.ttcn
3 files changed, 33 insertions(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved



diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index b44de9f..a99214b 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -1940,13 +1940,18 @@
 	vc_conn.done;
 }
 
-/* test if L3 RR CLASSMARK CHANGE is translated to BSSMAP CLASSMARK UPDATE */
+/* test the procedure of the MSC requesting a Classmark Update:
+ * a) BSSMAP Classmark Request should result in RR CLASSMARK ENQUIRY,
+ * b) L3 RR CLASSMARK CHANGE should result in BSSMAP CLASSMARK UPDATE */
 private function f_tc_classmark(charstring id) runs on MSC_ConnHdlr {
 	g_pars := valueof(t_def_TestHdlrPars);
 	f_create_chan_and_exp();
 	/* we should now have a COMPL_L3 at the MSC */
 	BSSAP.receive(tr_BSSMAP_ComplL3);
 
+	BSSAP.send(ts_BSSMAP_ClassmarkRequest);
+	RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, decmatch tr_RRM_CM_ENQUIRY));
+
 	f_rsl_send_l3(ts_RRM_CM_CHG(valueof(ts_CM2)));
 	BSSAP.receive(tr_BSSMAP_ClassmarkUpd(?, omit));
 	setverdict(pass);
diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn
index d92ea61..a3a50de 100644
--- a/library/BSSMAP_Templates.ttcn
+++ b/library/BSSMAP_Templates.ttcn
@@ -944,6 +944,18 @@
 	}
 }
 
+template PDU_BSSAP ts_BSSMAP_ClassmarkRequest
+modifies ts_BSSAP_BSSMAP := {
+	pdu := {
+		bssmap := {
+			classmarkRequest := {
+				messageType := '58'O,
+				talkerPriority := omit
+			}
+		}
+	}
+}
+
 /* return Layer3 octetstring inside BSSAP PDU */
 function f_bssap_extract_l3(PDU_BSSAP bssap) return template octetstring {
 	if (ischosen(bssap.pdu.bssmap)) {
diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn
index 557b1b8..1ce84cf 100644
--- a/library/L3_Templates.ttcn
+++ b/library/L3_Templates.ttcn
@@ -525,6 +525,21 @@
 	}
 }
 
+template PDU_ML3_NW_MS tr_RRM_CM_ENQUIRY := {
+	discriminator := '0110'B,
+	tiOrSkip := {
+		skipIndicator := '0000'B
+	},
+	msgs := {
+		rrm := {
+			classmarkEnquiry := {
+				messageType := '00010011'B,
+				classmarkEnquiryMask := *
+			}
+		}
+	}
+}
+
 template (value) PDU_ML3_MS_NW ts_RRM_UL_REL(OCT1 cause) := {
 	discriminator := '0110'B,
 	tiOrSkip := {

-- 
To view, visit https://gerrit.osmocom.org/11012
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Idaab4d568cf986b4897ba008f6262c839d1592fb
Gerrit-Change-Number: 11012
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Vadim Yanitskiy <axilirator at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180918/9056167a/attachment.htm>