<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24402">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">NS_Tests: add testcases for incoming SNS_ADD/DEL procedures<br><br>Allow to test add and remove a bind via vty.<br><br>Related: OS#5036<br>Change-Id: I98c04c083521ab38b58e8df9f1aee89445ab536d<br>---<br>M ns/NS_Tests.sns.cfg<br>M ns/NS_Tests.ttcn<br>M ns/osmo-ns.sns.cfg<br>3 files changed, 69 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ns/NS_Tests.sns.cfg b/ns/NS_Tests.sns.cfg</span><br><span>index 23b616b..5ee5e1a 100644</span><br><span>--- a/ns/NS_Tests.sns.cfg</span><br><span>+++ b/ns/NS_Tests.sns.cfg</span><br><span>@@ -21,6 +21,18 @@</span><br><span> }</span><br><span> },</span><br><span> nsvci := 1234</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%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ address_family := AF_INET,</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 := 22000,</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%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvci := 1235</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span>diff --git a/ns/NS_Tests.ttcn b/ns/NS_Tests.ttcn</span><br><span>index f69bbe0..58b2dda 100644</span><br><span>--- a/ns/NS_Tests.ttcn</span><br><span>+++ b/ns/NS_Tests.ttcn</span><br><span>@@ -44,6 +44,20 @@</span><br><span> }</span><br><span> },</span><br><span> nsvci := 97</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%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ address_family := AF_INET,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_udp_port := 21000,</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 := 23001,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ data_weight := 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ signalling_weight := 1</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%);">+ nsvci := 98</span><br><span> }</span><br><span> }</span><br><span> };</span><br><span>@@ -58,6 +72,7 @@</span><br><span> f_vty_set_prompts(NSVTY);</span><br><span> f_vty_transceive(NSVTY, "enable");</span><br><span> f_vty_transceive(NSVTY, "nsvc nsei " & int2str(mp_nsconfig.nsei) & " force-unconfigured");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_config2(NSVTY, {"ns", "nse " & int2str(mp_nsconfig.nsei)}, "no ip-sns-bind local2");</span><br><span> }</span><br><span> </span><br><span> /* ensure no matching message is received within 'tout' */</span><br><span>@@ -527,6 +542,42 @@</span><br><span> f_clean_ns_codec();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_sns_bss_add() runs on RAW_Test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ g_handle_rx_alive := true;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_vty();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(mp_nsconfig);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(mp_nsconfig, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_incoming_sns_size();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_incoming_sns_config();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_outgoing_sns_config();</span><br><span style="color: hsl(120, 100%, 40%);">+ activate(as_rx_alive_tx_ack());</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_config2(NSVTY, {"ns", "nse " & int2str(g_nsconfig.nsei)}, "ip-sns-bind local2");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_incoming_sns_add(idx_add := 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ as_rx_alive_tx_ack(oneshot := true, idx := 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_clean_ns_codec();</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%);">+testcase TC_sns_bss_del() runs on RAW_Test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ g_handle_rx_alive := true;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_vty();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(mp_nsconfig);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(mp_nsconfig, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_incoming_sns_size();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_incoming_sns_config();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_outgoing_sns_config();</span><br><span style="color: hsl(120, 100%, 40%);">+ activate(as_rx_alive_tx_ack());</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_config2(NSVTY, {"ns", "nse " & int2str(g_nsconfig.nsei)}, "ip-sns-bind local2");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_incoming_sns_add(idx_add := 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ as_rx_alive_tx_ack(oneshot := true, idx := 1);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* delete the endpoint */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_config2(NSVTY, {"ns", "nse " & int2str(g_nsconfig.nsei)}, "no ip-sns-bind local2");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_incoming_sns_del(idx_del := 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_clean_ns_codec();</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> control {</span><br><span> if (mp_dialect == NS2_DIALECT_STATIC_RESETBLOCK or mp_dialect == NS2_DIALECT_IPACCESS) {</span><br><span> execute( TC_tx_reset() );</span><br><span>@@ -574,6 +625,8 @@</span><br><span> execute( TC_sns_config_success() );</span><br><span> execute( TC_sns_bss_change_weight() );</span><br><span> execute( TC_sns_bss_change_weight_timeout() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_sns_bss_add() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_sns_bss_del() );</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>diff --git a/ns/osmo-ns.sns.cfg b/ns/osmo-ns.sns.cfg</span><br><span>index 58d306e..b342305 100644</span><br><span>--- a/ns/osmo-ns.sns.cfg</span><br><span>+++ b/ns/osmo-ns.sns.cfg</span><br><span>@@ -92,6 +92,10 @@</span><br><span> listen 127.0.0.1 23000</span><br><span> ip-sns signalling-weight 2 data-weight 2</span><br><span> accept-ipaccess</span><br><span style="color: hsl(120, 100%, 40%);">+ bind udp local2</span><br><span style="color: hsl(120, 100%, 40%);">+ listen 127.0.0.1 23001</span><br><span style="color: hsl(120, 100%, 40%);">+ ip-sns signalling-weight 1 data-weight 1</span><br><span style="color: hsl(120, 100%, 40%);">+ accept-ipaccess</span><br><span> nse 1234</span><br><span> ip-sns-remote 127.0.0.1 22000</span><br><span> ip-sns-bind local</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24402">change 24402</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/+/24402"/><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: I98c04c083521ab38b58e8df9f1aee89445ab536d </div>
<div style="display:none"> Gerrit-Change-Number: 24402 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </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>