<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19115">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc: verify data of SI2quater sent from osmo-bsc<br><br>Change-Id: Ia1736d75839031e90d73dda1d1c267cadc55b702<br>---<br>M bsc/BSC_Tests.ttcn<br>M bsc/gen_links.sh<br>2 files changed, 34 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/15/19115/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn</span><br><span>index cae91f3..28493a4 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -59,6 +59,8 @@</span><br><span> </span><br><span> import from SCCPasp_Types all;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+import from GSM_RestOctets all;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> const integer NUM_BTS := 3;</span><br><span> const integer NUM_MSC := 3;</span><br><span> const float T3101_MAX := 12.0;</span><br><span>@@ -98,6 +100,10 @@</span><br><span> /* List of all the System Information received on all RSL ports */</span><br><span> type record of SystemInformationConfig SystemInformationConfig_list;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+type set SystemInformationData {</span><br><span style="color: hsl(120, 100%, 40%);">+ SI2quaterRestOctets si2quater optional</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> const SystemInformationConfig SystemInformationConfig_default := {</span><br><span> { si_type := RSL_SYSTEM_INFO_1, from_rsl_msg_type := RSL_MT_BCCH_INFO, data := omit },</span><br><span> { si_type := RSL_SYSTEM_INFO_2, from_rsl_msg_type := RSL_MT_BCCH_INFO, data := omit },</span><br><span>@@ -114,6 +120,10 @@</span><br><span> { si_type := RSL_SYSTEM_INFO_6, from_rsl_msg_type := RSL_MT_SACCH_FILL, data := omit }</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+template SystemInformationData SystemInformationData_default := {</span><br><span style="color: hsl(120, 100%, 40%);">+ si2quater := tra_SI2quaterRestOctets_EUTRAN</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> type component test_CT extends CTRL_Adapter_CT {</span><br><span> /* Array of per-BTS state */</span><br><span> var BTS_State bts[NUM_BTS];</span><br><span>@@ -218,6 +228,28 @@</span><br><span> setverdict(pass);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+private function f_sysinfo_verify_data(integer rsl_idx, template SystemInformationData expected_data := SystemInformationData_default)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on test_CT</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ispresent(expected_data.si2quater)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ var SystemInformation rx_si2quater := f_sysinfo_get(rsl_idx, RSL_SYSTEM_INFO_2quater);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not isbound(rx_si2quater)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "RSL ", rsl_idx, ": Expected to see SI2quater during startup, but it was not sent");</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ var SI2quaterRestOctets rx_data := dec_SI2quaterRestOctets(rx_si2quater.data);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (match(rx_data, expected_data.si2quater)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "received SI2quater does not match expectations: rx ",</span><br><span style="color: hsl(120, 100%, 40%);">+ rx_data, " -- expected ", expected_data.si2quater);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> modulepar {</span><br><span> /* IP address at which the BSC can be reached */</span><br><span> charstring mp_bsc_ip := "127.0.0.1";</span><br><span>@@ -652,6 +684,7 @@</span><br><span> </span><br><span> deactivate(sysinfo);</span><br><span> f_sysinfo_verify_presence(i);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_sysinfo_verify_data(i);</span><br><span> }</span><br><span> </span><br><span> }</span><br><span>diff --git a/bsc/gen_links.sh b/bsc/gen_links.sh</span><br><span>index a936ef3..b0f21c7 100755</span><br><span>--- a/bsc/gen_links.sh</span><br><span>+++ b/bsc/gen_links.sh</span><br><span>@@ -67,7 +67,7 @@</span><br><span> gen_links $DIR $FILES</span><br><span> </span><br><span> DIR=../library</span><br><span style="color: hsl(0, 100%, 40%);">-FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn RAN_Emulation.ttcnpp RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn RSL_Emulation.ttcn MGCP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc BSSAP_CodecPort.ttcn RAN_Adapter.ttcnpp Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn SCCP_Templates.ttcn IPA_Testing.ttcn "</span><br><span style="color: hsl(120, 100%, 40%);">+FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn RAN_Emulation.ttcnpp RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn RSL_Emulation.ttcn MGCP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc BSSAP_CodecPort.ttcn RAN_Adapter.ttcnpp Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn SCCP_Templates.ttcn IPA_Testing.ttcn GSM_RestOctets.ttcn "</span><br><span> FILES+="CBSP_Types.ttcn CBSP_Templates.ttcn "</span><br><span> FILES+="CBSP_CodecPort.ttcn CBSP_CodecPort_CtrlFunct.ttcn CBSP_CodecPort_CtrlFunctdef.cc CBSP_Adapter.ttcn "</span><br><span> gen_links $DIR $FILES</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19115">change 19115</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19115"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ia1736d75839031e90d73dda1d1c267cadc55b702 </div>
<div style="display:none"> Gerrit-Change-Number: 19115 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>