<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18794">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc: undup pars.sccp_addr_msc and _bsc<br><br>Handover testing required passing MSC and BSC addresses to f_tc_* functions and<br>added pars.handover.sccp_addr_msc and .handover.sccp_addr_bsc.<br><br>MSC pool tests added a separate sub-record pars.mscpool which also contains<br>these two fields.<br><br>Move them both up one level, to form a single pair of pars.sccp_addr_msc and<br>pars.sccp_addr_bsc.<br><br>This eliminates the pars.handover sub-record.<br><br>Change-Id: Iae81ca58001455099218ce769a97dc6402832490<br>---<br>M bsc/BSC_Tests.ttcn<br>M bsc/MSC_ConnectionHandler.ttcn<br>2 files changed, 25 insertions(+), 32 deletions(-)<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/94/18794/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 9d48d62..1d2d312 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -3313,7 +3313,7 @@</span><br><span> f_MscConnHdlr_init(g_pars.media_nr, "127.0.0.2", "127.0.0.3", FR_AMR);</span><br><span> activate(as_Media());</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- BSSAP.send(ts_BSSAP_Conn_Req(g_pars.handover.sccp_addr_bsc, g_pars.handover.sccp_addr_msc,</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc,</span><br><span> f_gen_handover_req()));</span><br><span> BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND);</span><br><span> </span><br><span>@@ -3368,8 +3368,8 @@</span><br><span> f_init(1, true);</span><br><span> f_sleep(1.0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- pars.handover.sccp_addr_msc := g_bssap[0].sccp_addr_own;</span><br><span style="color: hsl(0, 100%, 40%);">- pars.handover.sccp_addr_bsc := g_bssap[0].sccp_addr_peer;</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.sccp_addr_msc := g_bssap[0].sccp_addr_own;</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer;</span><br><span> </span><br><span> vc_conn := f_start_handler(refers(f_tc_ho_into_this_bsc), pars);</span><br><span> vc_conn.done;</span><br><span>@@ -3385,7 +3385,7 @@</span><br><span> f_MscConnHdlr_init(g_pars.media_nr, "127.0.0.2", "127.0.0.3", FR_AMR);</span><br><span> activate(as_Media());</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- BSSAP.send(ts_BSSAP_Conn_Req(g_pars.handover.sccp_addr_bsc, g_pars.handover.sccp_addr_msc,</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc,</span><br><span> f_gen_handover_req()));</span><br><span> BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND);</span><br><span> </span><br><span>@@ -3441,8 +3441,8 @@</span><br><span> f_init(1, true);</span><br><span> f_sleep(1.0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- pars.handover.sccp_addr_msc := g_bssap[0].sccp_addr_own;</span><br><span style="color: hsl(0, 100%, 40%);">- pars.handover.sccp_addr_bsc := g_bssap[0].sccp_addr_peer;</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.sccp_addr_msc := g_bssap[0].sccp_addr_own;</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer;</span><br><span> </span><br><span> vc_conn := f_start_handler(refers(f_tc_ho_in_fail_msc_clears), pars);</span><br><span> vc_conn.done;</span><br><span>@@ -3463,7 +3463,7 @@</span><br><span> f_MscConnHdlr_init(g_pars.media_nr, "127.0.0.2", "127.0.0.3", FR_AMR);</span><br><span> activate(as_Media());</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- BSSAP.send(ts_BSSAP_Conn_Req(g_pars.handover.sccp_addr_bsc, g_pars.handover.sccp_addr_msc,</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc,</span><br><span> f_gen_handover_req()));</span><br><span> BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND);</span><br><span> </span><br><span>@@ -3521,8 +3521,8 @@</span><br><span> f_init(1, true);</span><br><span> f_sleep(1.0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- pars.handover.sccp_addr_msc := g_bssap[0].sccp_addr_own;</span><br><span style="color: hsl(0, 100%, 40%);">- pars.handover.sccp_addr_bsc := g_bssap[0].sccp_addr_peer;</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.sccp_addr_msc := g_bssap[0].sccp_addr_own;</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer;</span><br><span> </span><br><span> vc_conn := f_start_handler(refers(f_tc_ho_in_fail_msc_clears_after_ho_detect), pars);</span><br><span> vc_conn.done;</span><br><span>@@ -3539,7 +3539,7 @@</span><br><span> f_MscConnHdlr_init(g_pars.media_nr, "127.0.0.2", "127.0.0.3", FR_AMR);</span><br><span> activate(as_Media());</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- BSSAP.send(ts_BSSAP_Conn_Req(g_pars.handover.sccp_addr_bsc, g_pars.handover.sccp_addr_msc,</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc,</span><br><span> f_gen_handover_req()));</span><br><span> BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND);</span><br><span> </span><br><span>@@ -3602,8 +3602,8 @@</span><br><span> f_init(1, true);</span><br><span> f_sleep(1.0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- pars.handover.sccp_addr_msc := g_bssap[0].sccp_addr_own;</span><br><span style="color: hsl(0, 100%, 40%);">- pars.handover.sccp_addr_bsc := g_bssap[0].sccp_addr_peer;</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.sccp_addr_msc := g_bssap[0].sccp_addr_own;</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer;</span><br><span> </span><br><span> vc_conn := f_start_handler(refers(f_tc_ho_in_fail_no_detect), pars);</span><br><span> vc_conn.done;</span><br><span>@@ -3620,7 +3620,7 @@</span><br><span> f_MscConnHdlr_init(g_pars.media_nr, "127.0.0.2", "127.0.0.3", FR_AMR);</span><br><span> activate(as_Media());</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- BSSAP.send(ts_BSSAP_Conn_Req(g_pars.handover.sccp_addr_bsc, g_pars.handover.sccp_addr_msc,</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc,</span><br><span> f_gen_handover_req()));</span><br><span> BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND);</span><br><span> </span><br><span>@@ -3673,8 +3673,8 @@</span><br><span> f_init(1, true);</span><br><span> f_sleep(1.0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- pars.handover.sccp_addr_msc := g_bssap[0].sccp_addr_own;</span><br><span style="color: hsl(0, 100%, 40%);">- pars.handover.sccp_addr_bsc := g_bssap[0].sccp_addr_peer;</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.sccp_addr_msc := g_bssap[0].sccp_addr_own;</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer;</span><br><span> </span><br><span> vc_conn := f_start_handler(refers(f_tc_ho_in_fail_no_detect2), pars);</span><br><span> vc_conn.done;</span><br><span>@@ -4875,7 +4875,7 @@</span><br><span> </span><br><span> f_MscConnHdlr_init(g_pars.media_nr, "127.0.0.2", "127.0.0.3", FR_AMR);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- paging := valueof(ts_BSSAP_UNITDATA_req(g_pars.mscpool.sccp_addr_bsc, g_pars.mscpool.sccp_addr_msc,</span><br><span style="color: hsl(120, 100%, 40%);">+ paging := valueof(ts_BSSAP_UNITDATA_req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc,</span><br><span> valueof(ts_BSSMAP_Paging(imsi, cid_list, omit, bssmap_chneed))));</span><br><span> BSSAP.send(paging);</span><br><span> </span><br><span>@@ -4904,8 +4904,8 @@</span><br><span> var MSC_ConnHdlr vc_conn1;</span><br><span> var TestHdlrParams pars1 := f_gen_test_hdlr_pars(bssap_idx := 0);</span><br><span> pars1.mscpool.rsl_idx := 0;</span><br><span style="color: hsl(0, 100%, 40%);">- pars1.mscpool.sccp_addr_bsc := g_bssap[pars1.mscpool.bssap_idx].sccp_addr_peer;</span><br><span style="color: hsl(0, 100%, 40%);">- pars1.mscpool.sccp_addr_msc := g_bssap[pars1.mscpool.bssap_idx].sccp_addr_own;</span><br><span style="color: hsl(120, 100%, 40%);">+ pars1.sccp_addr_bsc := g_bssap[pars1.mscpool.bssap_idx].sccp_addr_peer;</span><br><span style="color: hsl(120, 100%, 40%);">+ pars1.sccp_addr_msc := g_bssap[pars1.mscpool.bssap_idx].sccp_addr_own;</span><br><span> vc_conn1 := f_start_handler(refers(f_tc_mscpool_paging_imsi), pars1);</span><br><span> vc_conn1.done;</span><br><span> }</span><br><span>@@ -4923,7 +4923,7 @@</span><br><span> </span><br><span> f_MscConnHdlr_init(g_pars.media_nr, "127.0.0.2", "127.0.0.3", FR_AMR);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- paging := valueof(ts_BSSAP_UNITDATA_req(g_pars.mscpool.sccp_addr_bsc, g_pars.mscpool.sccp_addr_msc,</span><br><span style="color: hsl(120, 100%, 40%);">+ paging := valueof(ts_BSSAP_UNITDATA_req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc,</span><br><span> valueof(ts_BSSMAP_Paging('001010000000011'H, cid_list, tmsi, bssmap_chneed))));</span><br><span> BSSAP.send(paging);</span><br><span> </span><br><span>@@ -4953,8 +4953,8 @@</span><br><span> var MSC_ConnHdlr vc_conn1;</span><br><span> var TestHdlrParams pars1 := f_gen_test_hdlr_pars(bssap_idx := 0);</span><br><span> pars1.mscpool.rsl_idx := 0;</span><br><span style="color: hsl(0, 100%, 40%);">- pars1.mscpool.sccp_addr_bsc := g_bssap[pars1.mscpool.bssap_idx].sccp_addr_peer;</span><br><span style="color: hsl(0, 100%, 40%);">- pars1.mscpool.sccp_addr_msc := g_bssap[pars1.mscpool.bssap_idx].sccp_addr_own;</span><br><span style="color: hsl(120, 100%, 40%);">+ pars1.sccp_addr_bsc := g_bssap[pars1.mscpool.bssap_idx].sccp_addr_peer;</span><br><span style="color: hsl(120, 100%, 40%);">+ pars1.sccp_addr_msc := g_bssap[pars1.mscpool.bssap_idx].sccp_addr_own;</span><br><span> vc_conn1 := f_start_handler(refers(f_tc_mscpool_paging_tmsi), pars1);</span><br><span> vc_conn1.done;</span><br><span> }</span><br><span>diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn</span><br><span>index fece825..8ac7051 100644</span><br><span>--- a/bsc/MSC_ConnectionHandler.ttcn</span><br><span>+++ b/bsc/MSC_ConnectionHandler.ttcn</span><br><span>@@ -509,15 +509,8 @@</span><br><span> boolean adjust_cx_exp</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-type record TestHdlrParamsHandover {</span><br><span style="color: hsl(0, 100%, 40%);">- SCCP_PAR_Address sccp_addr_msc,</span><br><span style="color: hsl(0, 100%, 40%);">- SCCP_PAR_Address sccp_addr_bsc</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> type record TestHdlrParamsMSCPool {</span><br><span> integer bssap_idx,</span><br><span style="color: hsl(0, 100%, 40%);">- SCCP_PAR_Address sccp_addr_msc optional,</span><br><span style="color: hsl(0, 100%, 40%);">- SCCP_PAR_Address sccp_addr_bsc optional,</span><br><span> integer rsl_idx,</span><br><span> PDU_ML3_MS_NW l3_info optional</span><br><span> }</span><br><span>@@ -533,7 +526,8 @@</span><br><span> bitstring expect_mr_s0_s7 optional, /* typically present for AMR codecs */</span><br><span> TestHdlrEncrParams encr optional,</span><br><span> TestHdlrParamsLcls lcls,</span><br><span style="color: hsl(0, 100%, 40%);">- TestHdlrParamsHandover handover optional,</span><br><span style="color: hsl(120, 100%, 40%);">+ SCCP_PAR_Address sccp_addr_msc optional,</span><br><span style="color: hsl(120, 100%, 40%);">+ SCCP_PAR_Address sccp_addr_bsc optional,</span><br><span> uint5_t exp_ms_power_level,</span><br><span> boolean exp_ms_power_params,</span><br><span> boolean aoip,</span><br><span>@@ -561,15 +555,14 @@</span><br><span> exp_sts := omit,</span><br><span> adjust_cx_exp := true</span><br><span> },</span><br><span style="color: hsl(0, 100%, 40%);">- handover := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ sccp_addr_msc := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ sccp_addr_bsc := omit,</span><br><span> exp_ms_power_level := 7, /* calculated from osmo-bsc.cfg "ms max power" */</span><br><span> exp_ms_power_params := false,</span><br><span> aoip := true,</span><br><span> use_osmux := false,</span><br><span> mscpool := {</span><br><span> bssap_idx := 0,</span><br><span style="color: hsl(0, 100%, 40%);">- sccp_addr_msc := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- sccp_addr_bsc := omit,</span><br><span> rsl_idx := 0,</span><br><span> l3_info := omit</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18794">change 18794</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/+/18794"/><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: Iae81ca58001455099218ce769a97dc6402832490 </div>
<div style="display:none"> Gerrit-Change-Number: 18794 </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>