<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21165">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BSSGP_Emulation: Introduce MGMT port to per-BVC component<br><br>This port can (optionally) be connected to, and it will receive<br>state change notifications as well as permit the user to block/unblock<br>and reset the specific PTP BVC.<br><br>Change-Id: I1f0289c8805168e3daace4a7d76764b45cead3d0<br>---<br>M library/BSSGP_Emulation.ttcnpp<br>1 file changed, 54 insertions(+), 5 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/65/21165/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp</span><br><span>index 63e11f2..3f6adba 100644</span><br><span>--- a/library/BSSGP_Emulation.ttcnpp</span><br><span>+++ b/library/BSSGP_Emulation.ttcnpp</span><br><span>@@ -603,6 +603,9 @@</span><br><span> /* port towards the underlying BSSGP_CT */</span><br><span> port BSSGP_BVC_PT BVC;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* port to a management instance */</span><br><span style="color: hsl(120, 100%, 40%);">+ port BSSGP_BVC_MGMT_SP_PT MGMT;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* BSSGP-User SAP towards the user (Client) */</span><br><span> port BSSGP_SP_PT BSSGP_SP;</span><br><span> port BSSGP_SP_PT BSSGP_SP_SIG;</span><br><span>@@ -618,6 +621,9 @@</span><br><span> timer g_T1 := 15.0;</span><br><span> timer g_T2 := 60.0;</span><br><span> var boolean g_t1_waits_for_block_ack := false;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* for re-transmissions */</span><br><span style="color: hsl(120, 100%, 40%);">+ var BssgpCause g_last_block_cause;</span><br><span style="color: hsl(120, 100%, 40%);">+ var BssgpCause g_last_reset_cause;</span><br><span> </span><br><span> var ClientEntity ClientTable[16];</span><br><span> };</span><br><span>@@ -638,6 +644,27 @@</span><br><span> out NsUnitdataRequest;</span><br><span> } with { extension "internal" };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* port between BSSGP_BVC_CT and a management instance */</span><br><span style="color: hsl(120, 100%, 40%);">+type port BSSGP_BVC_MGMT_SP_PT message {</span><br><span style="color: hsl(120, 100%, 40%);">+ in BssgpResetRequest,</span><br><span style="color: hsl(120, 100%, 40%);">+ BssgpBlockRequest,</span><br><span style="color: hsl(120, 100%, 40%);">+ BssgpUnblockRequest;</span><br><span style="color: hsl(120, 100%, 40%);">+ out BssgpStatusIndication,</span><br><span style="color: hsl(120, 100%, 40%);">+ BssgpResetIndication;</span><br><span style="color: hsl(120, 100%, 40%);">+} with { extension "internal" };</span><br><span style="color: hsl(120, 100%, 40%);">+type port BSSGP_BVC_MGMT_PT message {</span><br><span style="color: hsl(120, 100%, 40%);">+ in BssgpStatusIndication,</span><br><span style="color: hsl(120, 100%, 40%);">+ BssgpResetIndication;</span><br><span style="color: hsl(120, 100%, 40%);">+} with { extension "internal" };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+type record BssgpResetRequest {</span><br><span style="color: hsl(120, 100%, 40%);">+ BssgpCause cause</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+type record BssgpBlockRequest {</span><br><span style="color: hsl(120, 100%, 40%);">+ BssgpCause cause</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+type record BssgpUnblockRequest {</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span> </span><br><span> /* one element in the per-TLLI state table */</span><br><span> type record ClientEntity {</span><br><span>@@ -892,6 +919,7 @@</span><br><span> BVC.send(ts_ptp_BnsUdReq(t_BVC_BLOCK(g_cfg.bvci, cause), 0, g_bvc_lsp));</span><br><span> g_t1_waits_for_block_ack := true;</span><br><span> g_T1.start;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_last_block_cause := cause;</span><br><span> }</span><br><span> </span><br><span> private function f_ptp_sendStatus(BssgpCause cause, PDU_BSSGP pdu) runs on BSSGP_BVC_CT {</span><br><span>@@ -899,22 +927,23 @@</span><br><span> BVC.send(ts_ptp_BnsUdReq(ts_BSSGP_STATUS(g_cfg.bvci, cause, pdu), g_cfg.bvci, g_bvc_lsp));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-private function f_ptp_sendReset() runs on BSSGP_BVC_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_ptp_sendReset(BssgpCause cause := BSSGP_CAUSE_OM_INTERVENTION) runs on BSSGP_BVC_CT {</span><br><span> var PDU_BSSGP pdu;</span><br><span> </span><br><span> /* The Cell Identifier IE is mandatory in the BVC-RESET PDU sent from BSS to</span><br><span> * SGSN in order to reset a BVC corresponding to a PTP functional entity. The</span><br><span> * Cell Identifier IE shall not be used in any other BVC-RESET PDU. */</span><br><span> if (g_sgsn_role) {</span><br><span style="color: hsl(0, 100%, 40%);">- pdu := valueof(ts_BVC_RESET(BSSGP_CAUSE_OM_INTERVENTION, g_cfg.bvci, omit));</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu := valueof(ts_BVC_RESET(cause, g_cfg.bvci, omit));</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- pdu := valueof(ts_BVC_RESET(BSSGP_CAUSE_OM_INTERVENTION, g_cfg.bvci, g_cfg.cell_id));</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu := valueof(ts_BVC_RESET(cause, g_cfg.bvci, g_cfg.cell_id));</span><br><span> }</span><br><span> </span><br><span> /* BVC-RESET is always sent via the SIGNALLING BVCI, see Table 5.4.1 */</span><br><span> BVC.send(ts_ptp_BnsUdReq(pdu, 0, g_bvc_lsp));</span><br><span> g_T2.start;</span><br><span> //f_change_state(BVC_S_WAIT_RESET);</span><br><span style="color: hsl(120, 100%, 40%);">+ g_last_reset_cause := cause;</span><br><span> }</span><br><span> </span><br><span> /* PTP-BVC is in BVC_S_BLOCKED state */</span><br><span>@@ -939,14 +968,19 @@</span><br><span> </span><br><span> [] g_T2.timeout {</span><br><span> /* BVC-RESET-ACK PDU was not received within T2: retransmit */</span><br><span style="color: hsl(0, 100%, 40%);">- f_ptp_sendReset();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ptp_sendReset(g_last_reset_cause);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ [] MGMT.receive(BssgpUnblockRequest:?) {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ptp_sendUnblock();</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> /* PTP-BVC is in UNBLOCKED state */</span><br><span> private altstep as_ptp_unblocked() runs on BSSGP_BVC_CT {</span><br><span> var NsUnitdataIndication udi;</span><br><span> var NsStatusIndication nsi;</span><br><span style="color: hsl(120, 100%, 40%);">+ var BssgpBlockRequest bbr;</span><br><span> var BSSGP_Client_CT vc_conn;</span><br><span> var ASP_Event evt;</span><br><span> var PDU_BSSGP bs_pdu;</span><br><span>@@ -976,7 +1010,7 @@</span><br><span> f_ptp_sendUnblock();</span><br><span> }</span><br><span> [g_t1_waits_for_block_ack] g_T1.timeout {</span><br><span style="color: hsl(0, 100%, 40%);">- f_ptp_sendBlock(BSSGP_CAUSE_OM_INTERVENTION);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ptp_sendBlock(g_last_block_cause);</span><br><span> }</span><br><span> </span><br><span> /* simply acknowledge all per-BVC Flow Control Messages */</span><br><span>@@ -1080,17 +1114,25 @@</span><br><span> var octetstring llc_enc := enc_PDU_LLC(llc);</span><br><span> BVC.send(ts_ptp_BnsUdReq(ts_BSSGP_DL_UD(tlli, llc_enc), g_cfg.bvci, oct2int(tlli)));</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ [] MGMT.receive(BssgpBlockRequest:?) -> value bbr {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ptp_sendBlock(bbr.cause);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> /* Events permitted in all states */</span><br><span> private altstep as_ptp_allstate() runs on BSSGP_BVC_CT {</span><br><span> var NsUnitdataIndication udi;</span><br><span style="color: hsl(120, 100%, 40%);">+ var BssgpResetRequest brr;</span><br><span> var BSSGP_Client_CT vc_conn;</span><br><span> var OCT4 tlli, tlli_old;</span><br><span> var hexstring imsi;</span><br><span> </span><br><span> /* Signaling BVC was reset */</span><br><span> [] BVC.receive(BssgpResetIndication:{0}) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (MGMT.checkstate("Connected")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ MGMT.send(BssgpResetIndication:{0});</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> if (not g_sgsn_role) {</span><br><span> f_ptp_change_state(BVC_S_BLOCKED);</span><br><span> /* when the BSS side signaling PTP is RESET, all PTP BVC must start the</span><br><span>@@ -1146,6 +1188,10 @@</span><br><span> f_tbl_client_llgmm_assign(tlli_old, tlli, vc_conn);</span><br><span> BSSGP_PROC.reply(BSSGP_llgmm_assign:{tlli_old, tlli}) to vc_conn;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ [] MGMT.receive(BssgpResetRequest:?) -> value brr {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ptp_sendReset(brr.cause);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> /* main loop for per-BVC component */</span><br><span>@@ -1194,6 +1240,9 @@</span><br><span> }</span><br><span> log("BVCI(", g_cfg.bvci, ") State Transition: ", g_ptp_bvc_state, " -> ", new_state);</span><br><span> g_ptp_bvc_state := new_state;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (MGMT.checkstate("Connected")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ MGMT.send(ts_BssgpStsInd(omit, g_cfg.bvci, g_ptp_bvc_state));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> for (var integer i := 0; i < sizeof(ClientTable); i := i+1) {</span><br><span> if (isbound(ClientTable[i].comp_ref) and ClientTable[i].comp_ref != null) {</span><br><span> BSSGP_SP.send(ts_BssgpStsInd(omit, g_cfg.bvci, g_ptp_bvc_state)) to ClientTable[i].comp_ref;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21165">change 21165</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/+/21165"/><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: I1f0289c8805168e3daace4a7d76764b45cead3d0 </div>
<div style="display:none"> Gerrit-Change-Number: 21165 </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-MessageType: newchange </div>