<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22702">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move "ro_integer" to Osmocom_Types<br><br>We don't need several re-definitions of a "record of integer" type,<br>plus associated helper functions. Let's move that to the shared<br>Osmocom_Types.ttcn<br><br>Change-Id: I6a68ab8180a40b93c540db9cb80941c39c2fb549<br>---<br>M gbproxy/GBProxy_Tests.ttcn<br>M library/L1CTL_PortType.ttcn<br>M library/NS_Emulation.ttcnpp<br>M library/Osmocom_Types.ttcn<br>4 files changed, 20 insertions(+), 20 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 506ed38..ad8874c 100644</span><br><span>--- a/gbproxy/GBProxy_Tests.ttcn</span><br><span>+++ b/gbproxy/GBProxy_Tests.ttcn</span><br><span>@@ -498,19 +498,6 @@</span><br><span> f_vty_transceive(GBPVTY, "enable");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-type record of integer ro_integer;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-private function ro_integer_contains(ro_integer r, integer x) return boolean {</span><br><span style="color: hsl(0, 100%, 40%);">- for (var integer j := 0; j < lengthof(r); j := j+1) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (r[j] == x) {</span><br><span style="color: hsl(0, 100%, 40%);">- return true;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- return false;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-private type record of ro_integer roro_integer;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* count the number of unblocked BVCI for each SGSN NSE */</span><br><span> private altstep as_count_unblocked4nse(integer sgsn_idx, inout roro_integer bvci_unblocked)</span><br><span> runs on test_CT {</span><br><span>diff --git a/library/L1CTL_PortType.ttcn b/library/L1CTL_PortType.ttcn</span><br><span>index 5c554c2..80e33a8 100644</span><br><span>--- a/library/L1CTL_PortType.ttcn</span><br><span>+++ b/library/L1CTL_PortType.ttcn</span><br><span>@@ -12,9 +12,9 @@</span><br><span> module L1CTL_PortType {</span><br><span> import from L1CTL_Types all;</span><br><span> import from UD_PortType all;</span><br><span style="color: hsl(120, 100%, 40%);">+ import from Socket_API_Definitions all;</span><br><span> import from UD_Types all;</span><br><span> import from Osmocom_Types all;</span><br><span style="color: hsl(0, 100%, 40%);">- import from Osmocom_Types all;</span><br><span> import from GSM_Types all;</span><br><span> import from GSM_RR_Types all;</span><br><span> import from L1CTL_PortType_CtrlFunct all;</span><br><span>@@ -32,7 +32,7 @@</span><br><span> charstring m_l1ctl_sock_path := "/tmp/osmocom_l2";</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- function f_L1CTL_getMsgLen(in octetstring stream, inout ro_integer args) return integer {</span><br><span style="color: hsl(120, 100%, 40%);">+ function f_L1CTL_getMsgLen(in octetstring stream, inout Socket_API_Definitions.ro_integer args) return integer {</span><br><span> var integer stream_len := lengthof(stream);</span><br><span> var integer len;</span><br><span> if (stream_len < 2) {</span><br><span>diff --git a/library/NS_Emulation.ttcnpp b/library/NS_Emulation.ttcnpp</span><br><span>index 34bbcd9..ca44a02 100644</span><br><span>--- a/library/NS_Emulation.ttcnpp</span><br><span>+++ b/library/NS_Emulation.ttcnpp</span><br><span>@@ -217,8 +217,8 @@</span><br><span> /* references to the per-NSVC components */</span><br><span> var NsvcTable g_nsvcs := {};</span><br><span> /* list of indexes to g_nsvcs[] of currently unblocked NSVCs */</span><br><span style="color: hsl(0, 100%, 40%);">- var ro_integer g_unblocked_nsvcs_sig := {};</span><br><span style="color: hsl(0, 100%, 40%);">- var ro_integer g_unblocked_nsvcs_data := {};</span><br><span style="color: hsl(120, 100%, 40%);">+ var Osmocom_Types.ro_integer g_unblocked_nsvcs_sig := {};</span><br><span style="color: hsl(120, 100%, 40%);">+ var Osmocom_Types.ro_integer g_unblocked_nsvcs_data := {};</span><br><span> };</span><br><span> type record NsvcTableEntry {</span><br><span> NSVCConfiguration cfg,</span><br><span>@@ -226,7 +226,6 @@</span><br><span> NsvcState state</span><br><span> };</span><br><span> type record of NsvcTableEntry NsvcTable;</span><br><span style="color: hsl(0, 100%, 40%);">- type record of integer ro_integer;</span><br><span> </span><br><span> /* internal port from the NS-VC point of view */</span><br><span> type port NSint_SP_PT message {</span><br><span>@@ -319,7 +318,7 @@</span><br><span> }</span><br><span> } else if (g_nsvcs[i].state == NSVC_S_ALIVE_UNBLOCKED and state != NSVC_S_ALIVE_UNBLOCKED) {</span><br><span> /* remove index to list of unblocked NSVCs */</span><br><span style="color: hsl(0, 100%, 40%);">- var ro_integer new_unblocked_nsvcs_sig := {};</span><br><span style="color: hsl(120, 100%, 40%);">+ var Osmocom_Types.ro_integer new_unblocked_nsvcs_sig := {};</span><br><span> for (var integer j := 0; j < lengthof(g_unblocked_nsvcs_sig); j := j+1) {</span><br><span> if (g_unblocked_nsvcs_sig[j] != i) {</span><br><span> new_unblocked_nsvcs_sig := new_unblocked_nsvcs_sig & {j};</span><br><span>@@ -327,7 +326,7 @@</span><br><span> }</span><br><span> g_unblocked_nsvcs_sig := new_unblocked_nsvcs_sig;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- var ro_integer new_unblocked_nsvcs_data := {};</span><br><span style="color: hsl(120, 100%, 40%);">+ var Osmocom_Types.ro_integer new_unblocked_nsvcs_data := {};</span><br><span> for (var integer j := 0; j < lengthof(g_unblocked_nsvcs_data); j := j+1) {</span><br><span> if (g_unblocked_nsvcs_data[j] != i) {</span><br><span> new_unblocked_nsvcs_data := new_unblocked_nsvcs_data & {j};</span><br><span>diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn</span><br><span>index e813a11..06920bf 100644</span><br><span>--- a/library/Osmocom_Types.ttcn</span><br><span>+++ b/library/Osmocom_Types.ttcn</span><br><span>@@ -283,5 +283,19 @@</span><br><span> return tmsi;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+type record of integer ro_integer;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+function ro_integer_contains(ro_integer r, integer x) return boolean {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (var integer j := 0; j < lengthof(r); j := j+1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (r[j] == x) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</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%);">+ return false;</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%);">+type record of ro_integer roro_integer;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> } with { encode "RAW"; variant "FIELDORDER(msb)" }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22702">change 22702</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/+/22702"/><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: I6a68ab8180a40b93c540db9cb80941c39c2fb549 </div>
<div style="display:none"> Gerrit-Change-Number: 22702 </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-MessageType: merged </div>