<p>lynxis lazus <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10376">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">NS_Emulation: support multiple instances at the same time<br><br>The NS_Emulation has configuration values hardcoded or bound<br>to module parameters which prevents multiple instances.<br>Replace the module parameter based configuration with configuration<br>given when starting the NS_Emaulation.<br><br>Change-Id: I9128f9ad5c372779c38799269393137ba52576cd<br>---<br>M library/NS_Emulation.ttcn<br>M pcu/PCU_Tests.cfg<br>M pcu/PCU_Tests.ttcn<br>M sgsn/SGSN_Tests.default<br>M sgsn/SGSN_Tests.ttcn<br>5 files changed, 62 insertions(+), 38 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/NS_Emulation.ttcn b/library/NS_Emulation.ttcn</span><br><span>index 01d45b4..7cccb25 100644</span><br><span>--- a/library/NS_Emulation.ttcn</span><br><span>+++ b/library/NS_Emulation.ttcn</span><br><span>@@ -72,7 +72,8 @@</span><br><span> out NsUnitdataRequest;</span><br><span> } with { extension "internal" };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- function NSStart() runs on NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ function NSStart(NSConfiguration init_config) runs on NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ config := init_config;</span><br><span> f_init();</span><br><span> f_ScanEvents();</span><br><span> }</span><br><span>@@ -80,7 +81,7 @@</span><br><span> private function f_init() runs on NS_CT {</span><br><span> var Result res;</span><br><span> /* Connect the UDP socket */</span><br><span style="color: hsl(0, 100%, 40%);">- res := f_IPL4_connect(NSCP, mp_remote_ip, mp_remote_udp_port, mp_local_ip, mp_local_udp_port, 0, { udp := {}});</span><br><span style="color: hsl(120, 100%, 40%);">+ res := f_IPL4_connect(NSCP, config.remote_ip, config.remote_udp_port, config.local_ip, config.local_udp_port, 0, { udp := {}});</span><br><span> if (not ispresent(res.connId)) {</span><br><span> setverdict(fail, "Could not connect NS UDP socket, check your configuration");</span><br><span> mtc.stop;</span><br><span>@@ -97,6 +98,8 @@</span><br><span> /* NS-User SAP towards the user */</span><br><span> port NS_SP_PT NS_SP;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ var NSConfiguration config;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> var NseState g_state := NSE_S_DEAD_BLOCKED;</span><br><span> var ConnectionId g_conn_id := -1;</span><br><span> </span><br><span>@@ -105,24 +108,24 @@</span><br><span> timer Tns_block := 10.0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- modulepar {</span><br><span style="color: hsl(0, 100%, 40%);">- PortNumber mp_local_udp_port := 23000;</span><br><span style="color: hsl(0, 100%, 40%);">- charstring mp_local_ip := "127.0.0.1";</span><br><span style="color: hsl(0, 100%, 40%);">- PortNumber mp_remote_udp_port := 21000;</span><br><span style="color: hsl(0, 100%, 40%);">- charstring mp_remote_ip := "127.0.0.1";</span><br><span style="color: hsl(0, 100%, 40%);">- Nsvci mp_nsvci := 0;</span><br><span style="color: hsl(0, 100%, 40%);">- Nsvci mp_nsei := 2342;</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(120, 100%, 40%);">+ type record NSConfiguration {</span><br><span style="color: hsl(120, 100%, 40%);">+ PortNumber local_udp_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ charstring local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ PortNumber remote_udp_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ charstring remote_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ Nsvci nsvci,</span><br><span style="color: hsl(120, 100%, 40%);">+ Nsvci nsei</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> private function f_change_state(NseState new_state) runs on NS_CT {</span><br><span> var NseState old_state := g_state;</span><br><span> g_state := new_state;</span><br><span> log("NS State Transition: ", old_state, " -> ", new_state);</span><br><span style="color: hsl(0, 100%, 40%);">- NS_SP.send(t_NsStsInd(mp_nsei, mp_nsvci, old_state, new_state));</span><br><span style="color: hsl(120, 100%, 40%);">+ NS_SP.send(t_NsStsInd(config.nsei, config.nsvci, old_state, new_state));</span><br><span> }</span><br><span> </span><br><span> private function f_sendReset() runs on NS_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.send(t_NS_Send(g_conn_id, t_NS_RESET(NS_CAUSE_OM_INTERVENTION, mp_nsvci, mp_nsei)));</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP.send(t_NS_Send(g_conn_id, t_NS_RESET(NS_CAUSE_OM_INTERVENTION, config.nsvci, config.nsei)));</span><br><span> g_state := NSE_S_WAIT_RESET;</span><br><span> }</span><br><span> </span><br><span>@@ -137,7 +140,7 @@</span><br><span> }</span><br><span> </span><br><span> private function f_sendBlock(NsCause cause) runs on NS_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.send(t_NS_Send(g_conn_id, t_NS_BLOCK(cause, mp_nsvci)));</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP.send(t_NS_Send(g_conn_id, t_NS_BLOCK(cause, config.nsvci)));</span><br><span> Tns_block.start;</span><br><span> }</span><br><span> </span><br><span>@@ -176,9 +179,9 @@</span><br><span> }</span><br><span> </span><br><span> /* Respond to RESET with correct NSEI/NSVCI */</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(t_NS_RecvFrom(t_NS_RESET(?, mp_nsvci, mp_nsei))) -> value rf {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP.receive(t_NS_RecvFrom(t_NS_RESET(?, config.nsvci, config.nsei))) -> value rf {</span><br><span> f_change_state(NSE_S_ALIVE_BLOCKED);</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.send(t_NS_Send(g_conn_id, t_NS_RESET_ACK(mp_nsvci, mp_nsei)));</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP.send(t_NS_Send(g_conn_id, t_NS_RESET_ACK(config.nsvci, config.nsei)));</span><br><span> }</span><br><span> </span><br><span> /* Respond to RESET with wrong NSEI/NSVCI */</span><br><span>@@ -210,7 +213,7 @@</span><br><span> }</span><br><span> } else if (g_state == NSE_S_WAIT_RESET) {</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(t_NS_RecvFrom(t_NS_RESET_ACK(mp_nsvci, mp_nsei))) -> value rf {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP.receive(t_NS_RecvFrom(t_NS_RESET_ACK(config.nsvci, config.nsei))) -> value rf {</span><br><span> f_change_state(NSE_S_ALIVE_BLOCKED);</span><br><span> f_sendAlive();</span><br><span> f_sendUnblock();</span><br><span>@@ -219,8 +222,8 @@</span><br><span> } else if (g_state == NSE_S_ALIVE_BLOCKED) {</span><br><span> alt {</span><br><span> /* bogus block, just respond with ACK */</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(t_NS_RecvFrom(t_NS_BLOCK(?, mp_nsvci))) -> value rf {</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.send(t_NS_Send(g_conn_id, t_NS_BLOCK_ACK(mp_nsvci)));</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP.receive(t_NS_RecvFrom(t_NS_BLOCK(?, config.nsvci))) -> value rf {</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP.send(t_NS_Send(g_conn_id, t_NS_BLOCK_ACK(config.nsvci)));</span><br><span> }</span><br><span> /* Respond to UNBLOCK with UNBLOCK-ACK + change state */</span><br><span> [] NSCP.receive(t_NS_RecvFrom(t_NS_UNBLOCK)) -> value rf {</span><br><span>@@ -244,26 +247,26 @@</span><br><span> NSCP.send(t_NS_Send(g_conn_id, t_NS_UNBLOCK_ACK));</span><br><span> }</span><br><span> /* Respond to BLOCK with BLOCK-ACK + change state */</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(t_NS_RecvFrom(t_NS_BLOCK(?, mp_nsvci))) -> value rf {</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.send(t_NS_Send(g_conn_id, t_NS_BLOCK_ACK(mp_nsvci)));</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP.receive(t_NS_RecvFrom(t_NS_BLOCK(?, config.nsvci))) -> value rf {</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP.send(t_NS_Send(g_conn_id, t_NS_BLOCK_ACK(config.nsvci)));</span><br><span> Tns_block.stop;</span><br><span> f_change_state(NSE_S_ALIVE_BLOCKED);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(t_NS_RecvFrom(t_NS_BLOCK_ACK(mp_nsvci))) -> value rf {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP.receive(t_NS_RecvFrom(t_NS_BLOCK_ACK(config.nsvci))) -> value rf {</span><br><span> Tns_block.stop;</span><br><span> }</span><br><span> /* NS-UNITDATA PDU from network to NS-UNITDATA.ind to user */</span><br><span> [] NSCP.receive(t_NS_RecvFrom(t_NS_UNITDATA(?, ?, ?))) -> value rf {</span><br><span style="color: hsl(0, 100%, 40%);">- NS_SP.send(t_NsUdInd(mp_nsei,</span><br><span style="color: hsl(120, 100%, 40%);">+ NS_SP.send(t_NsUdInd(config.nsei,</span><br><span> oct2int(rf.msg.pDU_NS_Unitdata.bVCI),</span><br><span> rf.msg.pDU_NS_Unitdata.nS_SDU));</span><br><span> }</span><br><span> /* NS-UNITDATA.req from user to NS-UNITDATA PDU on network */</span><br><span style="color: hsl(0, 100%, 40%);">- [] NS_SP.receive(t_NsUdReq(mp_nsei, ?, ?, omit)) -> value ud_req {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NS_SP.receive(t_NsUdReq(config.nsei, ?, ?, omit)) -> value ud_req {</span><br><span> /* using raw octetstring PDU */</span><br><span> NSCP.send(t_NS_Send(g_conn_id, t_NS_UNITDATA(t_SduCtrlB, ud_req.bvci, ud_req.sdu)));</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [] NS_SP.receive(t_NsUdReq(mp_nsei, ?, omit, ?)) -> value ud_req {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NS_SP.receive(t_NsUdReq(config.nsei, ?, omit, ?)) -> value ud_req {</span><br><span> /* using decoded BSSGP PDU that we need to encode first */</span><br><span> var octetstring enc := enc_PDU_BSSGP(ud_req.bssgp);</span><br><span> NSCP.send(t_NS_Send(g_conn_id, t_NS_UNITDATA(t_SduCtrlB, ud_req.bvci, enc)));</span><br><span>diff --git a/pcu/PCU_Tests.cfg b/pcu/PCU_Tests.cfg</span><br><span>index 20de54c..7e0b9f2 100644</span><br><span>--- a/pcu/PCU_Tests.cfg</span><br><span>+++ b/pcu/PCU_Tests.cfg</span><br><span>@@ -11,12 +11,15 @@</span><br><span> #mp_local_udp_port := 23000</span><br><span> #mp_remote_ip := "192.168.100.196"</span><br><span> #mp_remote_udp_port := 21000</span><br><span style="color: hsl(0, 100%, 40%);">-NS_Emulation.mp_local_ip := "127.0.0.1"</span><br><span style="color: hsl(0, 100%, 40%);">-NS_Emulation.mp_local_udp_port := 23000</span><br><span style="color: hsl(0, 100%, 40%);">-NS_Emulation.mp_remote_ip := "127.0.0.1"</span><br><span style="color: hsl(0, 100%, 40%);">-NS_Emulation.mp_remote_udp_port := 23001</span><br><span style="color: hsl(0, 100%, 40%);">-NS_Emulation.mp_nsei := 1234</span><br><span style="color: hsl(0, 100%, 40%);">-NS_Emulation.mp_nsvci := 1234</span><br><span style="color: hsl(120, 100%, 40%);">+PCU_Tests.mp_nsconfig := {</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ local_udp_port := 23000,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_udp_port := 23001,</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvci := 1234,</span><br><span style="color: hsl(120, 100%, 40%);">+ nsei := 1234</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> PCU_Tests.mp_gb_cfg := {</span><br><span> nsei := 1234,</span><br><span> bvci := 1234,</span><br><span>diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn</span><br><span>index dfd380d..d59ac11 100644</span><br><span>--- a/pcu/PCU_Tests.ttcn</span><br><span>+++ b/pcu/PCU_Tests.ttcn</span><br><span>@@ -33,6 +33,15 @@</span><br><span> },</span><br><span> sgsn_role := true</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ NSConfiguration mp_nsconfig := {</span><br><span style="color: hsl(120, 100%, 40%);">+ local_udp_port := 23000,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_udp_port := 21000,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvci := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ nsei := 2342</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span> }</span><br><span> </span><br><span> type component dummy_CT extends BSSGP_Client_CT {</span><br><span>@@ -66,7 +75,7 @@</span><br><span> connect(bssgp_component:BSCP, ns_component:NS_SP);</span><br><span> /* connect lower-end of NS emulation to NS_CODEC_PORT (on top of IPl4) */</span><br><span> map(ns_component:NSCP, system:NS_CODEC_PORT);</span><br><span style="color: hsl(0, 100%, 40%);">- ns_component.start(NSStart());</span><br><span style="color: hsl(120, 100%, 40%);">+ ns_component.start(NSStart(mp_nsconfig));</span><br><span> bssgp_component.start(BssgpStart(mp_gb_cfg));</span><br><span> </span><br><span> lapdm_component := lapdm_CT.create;</span><br><span>diff --git a/sgsn/SGSN_Tests.default b/sgsn/SGSN_Tests.default</span><br><span>index 3957e82..82682e2 100644</span><br><span>--- a/sgsn/SGSN_Tests.default</span><br><span>+++ b/sgsn/SGSN_Tests.default</span><br><span>@@ -20,12 +20,12 @@</span><br><span> </span><br><span> </span><br><span> [MODULE_PARAMETERS]</span><br><span style="color: hsl(0, 100%, 40%);">-#NS_Emulation.mp_local_ip := "192.168.100.239"</span><br><span style="color: hsl(0, 100%, 40%);">-NS_Emulation.mp_local_udp_port := 21000</span><br><span style="color: hsl(0, 100%, 40%);">-#NS_Emulation.mp_remote_ip := "192.168.100.196"</span><br><span style="color: hsl(0, 100%, 40%);">-NS_Emulation.mp_remote_udp_port := 23000</span><br><span style="color: hsl(0, 100%, 40%);">-NS_Emulation.mp_nsvci := 97</span><br><span style="color: hsl(0, 100%, 40%);">-NS_Emulation.mp_nsei := 96</span><br><span style="color: hsl(120, 100%, 40%);">+SGSN_Tests.mp_nsconfig := {</span><br><span style="color: hsl(120, 100%, 40%);">+ local_udp_port := 21000,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_udp_port := 23000,</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvci := 97,</span><br><span style="color: hsl(120, 100%, 40%);">+ nsei := 96</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoSGSN";</span><br><span> </span><br><span> [MAIN_CONTROLLER]</span><br><span>diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn</span><br><span>index 6c94d14..d2db909 100644</span><br><span>--- a/sgsn/SGSN_Tests.ttcn</span><br><span>+++ b/sgsn/SGSN_Tests.ttcn</span><br><span>@@ -43,6 +43,15 @@</span><br><span> charstring mp_hlr_ip := "127.0.0.1";</span><br><span> integer mp_hlr_port := 4222;</span><br><span> charstring mp_ggsn_ip := "127.0.0.2";</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ NSConfiguration mp_nsconfig := {</span><br><span style="color: hsl(120, 100%, 40%);">+ local_udp_port := 23000,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_udp_port := 21000,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvci := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ nsei := 2342</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span> };</span><br><span> </span><br><span> type record GbInstance {</span><br><span>@@ -106,7 +115,7 @@</span><br><span> /* connect lower end of NS emulation to NS codec port (on top of IPL4) */</span><br><span> map(gb.vc_NS:NSCP, system:NS_CODEC_PORT);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- gb.vc_NS.start(NSStart());</span><br><span style="color: hsl(120, 100%, 40%);">+ gb.vc_NS.start(NSStart(mp_nsconfig));</span><br><span> gb.vc_BSSGP.start(BssgpStart(gb.cfg));</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10376">change 10376</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/10376"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I9128f9ad5c372779c38799269393137ba52576cd </div>
<div style="display:none"> Gerrit-Change-Number: 10376 </div>
<div style="display:none"> Gerrit-PatchSet: 9 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>