<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21631">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gbproxy: Rename PCU port to PCU_PTP; SGSN port to SGSN_PTP<br><br>This way it's more obvious that it refers to the PTP BVC, like we<br>already use PCU_SIG and SGSN_SIG for the signaling BVCs.<br><br>Change-Id: Ie8d327b0c6fae0e7963cc5907ab0bc94e97c67f3<br>---<br>M gbproxy/GBProxy_Tests.ttcn<br>1 file changed, 31 insertions(+), 31 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn</span><br><span>index 0145c97..a2055ea 100644</span><br><span>--- a/gbproxy/GBProxy_Tests.ttcn</span><br><span>+++ b/gbproxy/GBProxy_Tests.ttcn</span><br><span>@@ -283,7 +283,7 @@</span><br><span> </span><br><span> type component BSSGP_ConnHdlr {</span><br><span> /* array of per-BVC ports on the PCU side */</span><br><span style="color: hsl(0, 100%, 40%);">- port BSSGP_PT PCU[NUM_PCU];</span><br><span style="color: hsl(120, 100%, 40%);">+ port BSSGP_PT PCU_PTP[NUM_PCU];</span><br><span> port BSSGP_PT PCU_SIG[NUM_PCU];</span><br><span> port BSSGP_PROC_PT PCU_PROC[NUM_PCU];</span><br><span> /* component reference to the component to which we're currently connected */</span><br><span>@@ -292,7 +292,7 @@</span><br><span> var BssgpBvcConfig pcu_bvc_cfg[NUM_PCU];</span><br><span> </span><br><span> /* array of per-BVC ports on the SGSN side */</span><br><span style="color: hsl(0, 100%, 40%);">- port BSSGP_PT SGSN[NUM_SGSN];</span><br><span style="color: hsl(120, 100%, 40%);">+ port BSSGP_PT SGSN_PTP[NUM_SGSN];</span><br><span> port BSSGP_PT SGSN_SIG[NUM_SGSN];</span><br><span> port BSSGP_PROC_PT SGSN_PROC[NUM_SGSN];</span><br><span> /* component reference to the component to which we're currently connected */</span><br><span>@@ -541,15 +541,15 @@</span><br><span> private function f_connect_to_pcu_bvc(integer port_idx, integer nse_idx, integer bvc_idx)</span><br><span> runs on BSSGP_ConnHdlr {</span><br><span> var BSSGP_BVC_CT bvc_ct := g_pars.pcu[nse_idx].vc_BSSGP_BVC[bvc_idx]</span><br><span style="color: hsl(0, 100%, 40%);">- if (PCU[port_idx].checkstate("Connected")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (PCU_PTP[port_idx].checkstate("Connected")) {</span><br><span> /* unregister + disconnect from old BVC */</span><br><span> f_client_unregister(g_pars.imsi, PCU_PROC[port_idx]);</span><br><span style="color: hsl(0, 100%, 40%);">- disconnect(self:PCU[port_idx], pcu_ct[port_idx]:BSSGP_SP);</span><br><span style="color: hsl(120, 100%, 40%);">+ disconnect(self:PCU_PTP[port_idx], pcu_ct[port_idx]:BSSGP_SP);</span><br><span> disconnect(self:PCU_SIG[port_idx], pcu_ct[port_idx]:BSSGP_SP_SIG);</span><br><span> disconnect(self:PCU_PROC[port_idx], pcu_ct[port_idx]:BSSGP_PROC);</span><br><span> }</span><br><span> /* connect to new BVC and register us */</span><br><span style="color: hsl(0, 100%, 40%);">- connect(self:PCU[port_idx], bvc_ct:BSSGP_SP);</span><br><span style="color: hsl(120, 100%, 40%);">+ connect(self:PCU_PTP[port_idx], bvc_ct:BSSGP_SP);</span><br><span> connect(self:PCU_SIG[port_idx], bvc_ct:BSSGP_SP_SIG);</span><br><span> connect(self:PCU_PROC[port_idx], bvc_ct:BSSGP_PROC);</span><br><span> f_client_register(g_pars.imsi, g_pars.tlli, PCU_PROC[port_idx]);</span><br><span>@@ -559,15 +559,15 @@</span><br><span> </span><br><span> /* Connect the SGSN-side per-BVC ports (SGSN/SGSN_SIG/SGSN_PROC) array slot 'port_idx' to specified per-BVC component */</span><br><span> private function f_connect_to_sgsn_bvc(integer port_idx, BSSGP_BVC_CT bvc_ct) runs on BSSGP_ConnHdlr {</span><br><span style="color: hsl(0, 100%, 40%);">- if (SGSN[port_idx].checkstate("Connected")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (SGSN_PTP[port_idx].checkstate("Connected")) {</span><br><span> /* unregister + disconnect from old BVC */</span><br><span> f_client_unregister(g_pars.imsi, SGSN_PROC[port_idx]);</span><br><span style="color: hsl(0, 100%, 40%);">- disconnect(self:SGSN[port_idx], sgsn_ct[port_idx]:BSSGP_SP);</span><br><span style="color: hsl(120, 100%, 40%);">+ disconnect(self:SGSN_PTP[port_idx], sgsn_ct[port_idx]:BSSGP_SP);</span><br><span> disconnect(self:SGSN_SIG[port_idx], sgsn_ct[port_idx]:BSSGP_SP_SIG);</span><br><span> disconnect(self:SGSN_PROC[port_idx], sgsn_ct[port_idx]:BSSGP_PROC);</span><br><span> }</span><br><span> /* connect to new BVC and register us */</span><br><span style="color: hsl(0, 100%, 40%);">- connect(self:SGSN[port_idx], bvc_ct:BSSGP_SP);</span><br><span style="color: hsl(120, 100%, 40%);">+ connect(self:SGSN_PTP[port_idx], bvc_ct:BSSGP_SP);</span><br><span> connect(self:SGSN_SIG[port_idx], bvc_ct:BSSGP_SP_SIG);</span><br><span> connect(self:SGSN_PROC[port_idx], bvc_ct:BSSGP_PROC);</span><br><span> f_client_register(g_pars.imsi, g_pars.tlli, SGSN_PROC[port_idx]);</span><br><span>@@ -630,7 +630,7 @@</span><br><span> if (use_sig) {</span><br><span> PCU_SIG[pcu_idx].send(tx);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- PCU[pcu_idx].send(tx);</span><br><span style="color: hsl(120, 100%, 40%);">+ PCU_PTP[pcu_idx].send(tx);</span><br><span> }</span><br><span> </span><br><span> T.start;</span><br><span>@@ -638,10 +638,10 @@</span><br><span> [use_sig] SGSN_SIG[sgsn_idx].receive(exp_rx) {</span><br><span> setverdict(pass);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [not use_sig] SGSN[sgsn_idx].receive(exp_rx) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [not use_sig] SGSN_PTP[sgsn_idx].receive(exp_rx) {</span><br><span> setverdict(pass);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [] SGSN[sgsn_idx].receive(PDU_BSSGP:?) -> value rx {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] SGSN_PTP[sgsn_idx].receive(PDU_BSSGP:?) -> value rx {</span><br><span> setverdict(fail, "Unexpected BSSGP on SGSN side: ", rx);</span><br><span> mtc.stop;</span><br><span> }</span><br><span>@@ -665,7 +665,7 @@</span><br><span> if (use_sig) {</span><br><span> SGSN_SIG[sgsn_idx].send(tx);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- SGSN[sgsn_idx].send(tx);</span><br><span style="color: hsl(120, 100%, 40%);">+ SGSN_PTP[sgsn_idx].send(tx);</span><br><span> }</span><br><span> </span><br><span> T.start;</span><br><span>@@ -673,10 +673,10 @@</span><br><span> [use_sig] PCU_SIG[pcu_idx].receive(exp_rx) {</span><br><span> setverdict(pass);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [not use_sig] PCU[pcu_idx].receive(exp_rx) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [not use_sig] PCU_PTP[pcu_idx].receive(exp_rx) {</span><br><span> setverdict(pass);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [] PCU[pcu_idx].receive(PDU_BSSGP:?) -> value rx {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] PCU_PTP[pcu_idx].receive(PDU_BSSGP:?) -> value rx {</span><br><span> setverdict(fail, "Unexpected BSSGP on PCU side: ", rx);</span><br><span> mtc.stop;</span><br><span> }</span><br><span>@@ -1046,7 +1046,7 @@</span><br><span> var octetstring payload := f_rnd_octstring(i);</span><br><span> var template (value) PDU_BSSGP pdu_tx :=</span><br><span> ts_BSSGP_DL_UD(g_pars.tlli, payload, omit, ts_BSSGP_IMSI(g_pars.imsi));</span><br><span style="color: hsl(0, 100%, 40%);">- SGSN[0].send(pdu_tx);</span><br><span style="color: hsl(120, 100%, 40%);">+ SGSN_PTP[0].send(pdu_tx);</span><br><span> }</span><br><span> setverdict(pass);</span><br><span> }</span><br><span>@@ -1134,7 +1134,7 @@</span><br><span> pdu_tx.pDU_BSSGP_PAGING_PS.paging_Field4 := p4;</span><br><span> pdu_rx.pDU_BSSGP_PAGING_PS.paging_Field4 := p4;</span><br><span> if (use_sig == false) {</span><br><span style="color: hsl(0, 100%, 40%);">- SGSN[sgsn_idx].send(pdu_tx);</span><br><span style="color: hsl(120, 100%, 40%);">+ SGSN_PTP[sgsn_idx].send(pdu_tx);</span><br><span> } else {</span><br><span> SGSN_SIG[sgsn_idx].send(pdu_tx);</span><br><span> }</span><br><span>@@ -1155,7 +1155,7 @@</span><br><span> timer T := 2.0;</span><br><span> T.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [not use_sig and not test_done] PCU[pcu_idx].receive(exp_rx) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [not use_sig and not test_done] PCU_PTP[pcu_idx].receive(exp_rx) {</span><br><span> setverdict(pass);</span><br><span> test_done := true;</span><br><span> repeat;</span><br><span>@@ -1168,16 +1168,16 @@</span><br><span> test_done := true;</span><br><span> repeat;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [use_sig] PCU[pcu_idx].receive(exp_rx) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [use_sig] PCU_PTP[pcu_idx].receive(exp_rx) {</span><br><span> setverdict(fail, "Received paging on PTP BVC, expected SIGNALING BVC");</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [] any from PCU.receive(exp_rx) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] any from PCU_PTP.receive(exp_rx) {</span><br><span> setverdict(fail, "Paging received on unexpected BVC");</span><br><span> }</span><br><span> [] any from PCU_SIG.receive(exp_rx) {</span><br><span> setverdict(fail, "Paging received on unexpected BVC");</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [] any from PCU.receive(PDU_BSSGP:{pDU_BSSGP_PAGING_PS:=?}) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] any from PCU_PTP.receive(PDU_BSSGP:{pDU_BSSGP_PAGING_PS:=?}) {</span><br><span> setverdict(fail, "Different Paging than expected received PTP BVC");</span><br><span> }</span><br><span> [] any from PCU_SIG.receive(PDU_BSSGP:{pDU_BSSGP_PAGING_PS:=?}) {</span><br><span>@@ -1200,13 +1200,13 @@</span><br><span> timer T := 2.0;</span><br><span> T.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] any from PCU.receive(exp_rx) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] any from PCU_PTP.receive(exp_rx) {</span><br><span> setverdict(fail, "Paging received on unexpected BVC");</span><br><span> }</span><br><span> [] any from PCU_SIG.receive(exp_rx) {</span><br><span> setverdict(fail, "Paging received on unexpected BVC");</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [] any from PCU.receive(PDU_BSSGP:{pDU_BSSGP_PAGING_PS:=?}) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] any from PCU_PTP.receive(PDU_BSSGP:{pDU_BSSGP_PAGING_PS:=?}) {</span><br><span> setverdict(fail, "Different Paging received on PTP BVC");</span><br><span> }</span><br><span> [] any from PCU_SIG.receive(PDU_BSSGP:{pDU_BSSGP_PAGING_PS:=?}) {</span><br><span>@@ -1354,13 +1354,13 @@</span><br><span> roi := roi & { pcu_idx };</span><br><span> repeat;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-[] PCU[pcu_idx].receive(exp_rx) {</span><br><span style="color: hsl(120, 100%, 40%);">+[] PCU_PTP[pcu_idx].receive(exp_rx) {</span><br><span> setverdict(fail, "Received paging on PTP BVC, expected SIGNALING BVC");</span><br><span> }</span><br><span> [] PCU_SIG[pcu_idx].receive(PDU_BSSGP:{pDU_BSSGP_PAGING_PS:=?}) {</span><br><span> setverdict(fail, "Different Paging than expected received SIGNALING BVC");</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-[] PCU[pcu_idx].receive(PDU_BSSGP:{pDU_BSSGP_PAGING_PS:=?}) {</span><br><span style="color: hsl(120, 100%, 40%);">+[] PCU_PTP[pcu_idx].receive(PDU_BSSGP:{pDU_BSSGP_PAGING_PS:=?}) {</span><br><span> setverdict(fail, "Different Paging than expected received PTP BVC");</span><br><span> }</span><br><span> }</span><br><span>@@ -1555,7 +1555,7 @@</span><br><span> pdu_tx.pDU_BSSGP_PAGING_CS.paging_Field4 := p4;</span><br><span> pdu_rx.pDU_BSSGP_PAGING_CS.paging_Field4 := p4;</span><br><span> if (use_sig == false) {</span><br><span style="color: hsl(0, 100%, 40%);">- SGSN[sgsn_idx].send(pdu_tx);</span><br><span style="color: hsl(120, 100%, 40%);">+ SGSN_PTP[sgsn_idx].send(pdu_tx);</span><br><span> } else {</span><br><span> SGSN_SIG[sgsn_idx].send(pdu_tx);</span><br><span> }</span><br><span>@@ -1576,7 +1576,7 @@</span><br><span> timer T := 2.0;</span><br><span> T.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [not use_sig and not test_done] PCU[pcu_idx].receive(exp_rx) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [not use_sig and not test_done] PCU_PTP[pcu_idx].receive(exp_rx) {</span><br><span> setverdict(pass);</span><br><span> test_done := true;</span><br><span> repeat;</span><br><span>@@ -1589,16 +1589,16 @@</span><br><span> test_done := true;</span><br><span> repeat;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [use_sig] PCU[pcu_idx].receive(exp_rx) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [use_sig] PCU_PTP[pcu_idx].receive(exp_rx) {</span><br><span> setverdict(fail, "Received paging on PTP BVC, expected SIGNALING BVC");</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [] any from PCU.receive(exp_rx) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] any from PCU_PTP.receive(exp_rx) {</span><br><span> setverdict(fail, "Paging received on unexpected BVC");</span><br><span> }</span><br><span> [] any from PCU_SIG.receive(exp_rx) {</span><br><span> setverdict(fail, "Paging received on unexpected BVC");</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [] any from PCU.receive(PDU_BSSGP:{pDU_BSSGP_PAGING_CS:=?}) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] any from PCU_PTP.receive(PDU_BSSGP:{pDU_BSSGP_PAGING_CS:=?}) {</span><br><span> setverdict(fail, "Different Paging than expected received PTP BVC");</span><br><span> }</span><br><span> [] any from PCU_SIG.receive(PDU_BSSGP:{pDU_BSSGP_PAGING_CS:=?}) {</span><br><span>@@ -1621,13 +1621,13 @@</span><br><span> timer T := 2.0;</span><br><span> T.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] any from PCU.receive(exp_rx) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] any from PCU_PTP.receive(exp_rx) {</span><br><span> setverdict(fail, "Paging received on unexpected BVC");</span><br><span> }</span><br><span> [] any from PCU_SIG.receive(exp_rx) {</span><br><span> setverdict(fail, "Paging received on unexpected BVC");</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [] any from PCU.receive(PDU_BSSGP:{pDU_BSSGP_PAGING_CS:=?}) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] any from PCU_PTP.receive(PDU_BSSGP:{pDU_BSSGP_PAGING_CS:=?}) {</span><br><span> setverdict(fail, "Different Paging received on PTP BVC");</span><br><span> }</span><br><span> [] any from PCU_SIG.receive(PDU_BSSGP:{pDU_BSSGP_PAGING_CS:=?}) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21631">change 21631</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/+/21631"/><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: Ie8d327b0c6fae0e7963cc5907ab0bc94e97c67f3 </div>
<div style="display:none"> Gerrit-Change-Number: 21631 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>