RAW_NS: rework NS connection to use NS_Provider
Previous RAW_NS only supported NS over UDP because
it handled the UDP connection on it's own.
Because of this there was no cleanup function for the tests
because no virtual component were started.
Using the new NS_Provider allows to use the same tests over
UDP and FR with no changes.
Change-Id: I8a3b6c72798a75f434f54229fdbfc802cd13967e
diff --git a/sgsn/SGSN_Tests_NS.ttcn b/sgsn/SGSN_Tests_NS.ttcn
index cce32cc..9ef2dfb 100644
--- a/sgsn/SGSN_Tests_NS.ttcn
+++ b/sgsn/SGSN_Tests_NS.ttcn
@@ -13,7 +13,6 @@
import from Osmocom_Types all;
import from Osmocom_Gb_Types all;
import from Osmocom_VTY_Functions all;
-import from NS_CodecPort all;
import from NS_Types all;
import from RAW_NS all;
import from SGSN_Tests all;
@@ -23,31 +22,31 @@
testcase TC_NS_connect_reset() runs on RAW_Test_CT {
f_init_vty();
- f_init_ns_codec(mp_nsconfig[0], guard_secs := 10.0, tc_offset := 10);
+ f_init_ns_codec(mp_nsconfig[0], guard_secs := 10.0);
f_vty_config(SGSNVTY, "ns", "encapsulation udp use-reset-block-unblock enabled");
/* Send a NS-ALIVE */
f_outgoing_ns_reset();
f_sleep(1.0);
- f_cleanup();
+ f_clean_ns_codec();
}
testcase TC_NS_connect_alive() runs on RAW_Test_CT {
f_init_vty();
- f_init_ns_codec(mp_nsconfig[0], guard_secs := 10.0, tc_offset := 20);
+ f_init_ns_codec(mp_nsconfig[0], guard_secs := 10.0);
f_vty_config(SGSNVTY, "ns", "encapsulation udp use-reset-block-unblock disabled");
/* Send a NS-ALIVE */
- NSCP[0].send(t_NS_Send(g_ns_conn_id[0], t_NS_ALIVE));
+ NSCP[0].send(t_NS_ALIVE);
alt {
- [] NSCP[0].receive(t_NS_RecvFrom(t_NS_ALIVE_ACK));
- [] NSCP[0].receive(t_NS_RecvFrom(tr_NS_STATUS(*))) { setverdict(fail); }
+ [] NSCP[0].receive(t_NS_ALIVE_ACK);
+ [] NSCP[0].receive(tr_NS_STATUS(*)) { setverdict(fail); }
[] NSCP[0].receive { repeat; }
}
f_sleep(1.0);
- f_cleanup();
+ f_clean_ns_codec();
}
control {