<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16043">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;">stp: Introduce TC_tmt_override<br><br>Change-Id: Id99ec3eaa431512114817d2a2af77013762ab2b9<br>---<br>M stp/STP_Tests_IPA.ttcn<br>M stp/osmo-stp.cfg<br>2 files changed, 49 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn</span><br><span>index f7273dc..946a950 100644</span><br><span>--- a/stp/STP_Tests_IPA.ttcn</span><br><span>+++ b/stp/STP_Tests_IPA.ttcn</span><br><span>@@ -33,7 +33,7 @@</span><br><span> </span><br><span> import from STP_Tests_Common all;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-private const integer NR_IPA := 4;</span><br><span style="color: hsl(120, 100%, 40%);">+private const integer NR_IPA := 7;</span><br><span> </span><br><span> type record of charstring AspNameArray;</span><br><span> </span><br><span>@@ -43,7 +43,10 @@</span><br><span> AspNameArray mp_ipa_as_names := {"ipa-as-loadshare-sender",</span><br><span> "ipa-as-loadshare-receiver",</span><br><span> "ipa-as-loadshare-receiver",</span><br><span style="color: hsl(0, 100%, 40%);">- "ipa-as-dynamic-asp"</span><br><span style="color: hsl(120, 100%, 40%);">+ "ipa-as-dynamic-asp",</span><br><span style="color: hsl(120, 100%, 40%);">+ "ipa-as-override-sender",</span><br><span style="color: hsl(120, 100%, 40%);">+ "ipa-as-override-receiver",</span><br><span style="color: hsl(120, 100%, 40%);">+ "ipa-as-override-receiver"</span><br><span> };</span><br><span> }</span><br><span> </span><br><span>@@ -165,6 +168,27 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* test "traffic-mode override" behavior */</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_tmt_override() runs on IPA_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ipa();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* bring up the 'sender' side (single ASP in AS) */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_connect_ipa(4);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* activate the first 'receiver' side ASP */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_connect_ipa(5);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_sleep(1.0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* verify traffic is routed from sender to [sole] receiver */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_test_traffic(4, 5);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* activate the second 'receiver' side ASP */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_connect_ipa(6);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_sleep(1.0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* verify traffic is routed from sender to new receiver */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_test_traffic(4, 6);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> private altstep as_count_rx(integer idx, template (present) octetstring exp, inout integer counter)</span><br><span> runs on IPA_CT {</span><br><span> [] IPA[idx].receive(t_ASP_MTP3_TRANSFERind(?, ?, ?, ?, exp)) {</span><br><span>@@ -214,11 +238,11 @@</span><br><span> setverdict(pass);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> control {</span><br><span> execute( TC_unknown_client_nodynamic() );</span><br><span> execute( TC_known_client_nodynamic() );</span><br><span> execute( TC_unknown_client_dynamic() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute (TC_tmt_override() );</span><br><span> execute( TC_tmt_loadshare() );</span><br><span> }</span><br><span> </span><br><span>diff --git a/stp/osmo-stp.cfg b/stp/osmo-stp.cfg</span><br><span>index 26ab7f6..50c80d3 100644</span><br><span>--- a/stp/osmo-stp.cfg</span><br><span>+++ b/stp/osmo-stp.cfg</span><br><span>@@ -85,7 +85,27 @@</span><br><span> point-code override dpc 32</span><br><span> asp ipa-asp-loadshare-receiver0</span><br><span> asp ipa-asp-loadshare-receiver1</span><br><span style="color: hsl(0, 100%, 40%);">- !Used by STP_Tests.ttcn:</span><br><span style="color: hsl(120, 100%, 40%);">+! OVERRIDE:</span><br><span style="color: hsl(120, 100%, 40%);">+ asp ipa-asp-override-sender 20004 5000 ipa</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-ip 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+ as ipa-as-override-sender ipa</span><br><span style="color: hsl(120, 100%, 40%);">+ routing-key 0 6</span><br><span style="color: hsl(120, 100%, 40%);">+ point-code override dpc 33</span><br><span style="color: hsl(120, 100%, 40%);">+ asp ipa-asp-override-sender</span><br><span style="color: hsl(120, 100%, 40%);">+ asp ipa-asp-override-receiver0 20005 5000 ipa</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-ip 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+ asp ipa-asp-override-receiver1 20006 5000 ipa</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-ip 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+ as ipa-as-override-receiver ipa</span><br><span style="color: hsl(120, 100%, 40%);">+ traffic-mode override</span><br><span style="color: hsl(120, 100%, 40%);">+ routing-key 0 8</span><br><span style="color: hsl(120, 100%, 40%);">+ point-code override dpc 34</span><br><span style="color: hsl(120, 100%, 40%);">+ asp ipa-asp-override-receiver0</span><br><span style="color: hsl(120, 100%, 40%);">+ asp ipa-asp-override-receiver1</span><br><span style="color: hsl(120, 100%, 40%);">+! DYNAMIC AS:</span><br><span> as ipa-as-dynamic-asp ipa</span><br><span> routing-key 0 5</span><br><span> point-code override dpc 23</span><br><span>@@ -97,6 +117,7 @@</span><br><span> update route 42 16777215 linkset as-receiver</span><br><span> update route 55 16777215 linkset as-client</span><br><span> update route 31 16777215 linkset ipa-as-loadshare-receiver</span><br><span style="color: hsl(120, 100%, 40%);">+ update route 33 16777215 linkset ipa-as-override-receiver</span><br><span> update route 5 16777215 linkset ipa-as-dynamic-asp</span><br><span> !</span><br><span> !SERVERS:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16043">change 16043</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/+/16043"/><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: Id99ec3eaa431512114817d2a2af77013762ab2b9 </div>
<div style="display:none"> Gerrit-Change-Number: 16043 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </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>