pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37960?usp=email )
(
2 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: s1gw: TC_setup: Validate some metrics
......................................................................
s1gw: TC_setup: Validate some metrics
Change-Id: Iae629bc9291ff8b6e482f61d692e4d97ff0136bd
---
M s1gw/S1GW_Tests.ttcn
1 file changed, 28 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn
index 765d3d8..06e4877 100644
--- a/s1gw/S1GW_Tests.ttcn
+++ b/s1gw/S1GW_Tests.ttcn
@@ -140,11 +140,25 @@
f_ConnHdlr_register_pfcp();
f_ConnHdlr_s1ap_register(g_pars.genb_id);
+ /* Expected values relative to snapshot: */
+ var StatsDExpects statsd_exp := {
+ {name := mp_statsd_prefix &
"gauge.s1ap.enb.num_sctp_connections.value", mtype := "g", min := 1, max := 1},
+ {name := mp_statsd_prefix &
"ctr.s1ap.proxy.in_pkt.unmodified.value", mtype := "c", min := 2, max := 2}
+ }
+ var StatsDMetrics statsd_snapshot :=
f_statsd_snapshot(f_statsd_keys_from_expect(statsd_exp));
+
f_ConnHdlr_s1ap_connect(mp_enb_bind_ip, mp_s1gw_enb_ip);
f_ConnHdlr_s1ap_setup(g_pars.genb_id);
f_sleep(0.5); /* keep the connection idle for some time */
+
+ f_statsd_expect_from_snapshot(statsd_exp, wait_converge := true,
snapshot := statsd_snapshot);
+
f_ConnHdlr_s1ap_disconnect();
+ /* Validate gauge decreases when we disconnect: */
+ f_statsd_expect({{name := mp_statsd_prefix &
"gauge.s1ap.enb.num_sctp_connections.value", mtype := "g", min := 0, max := 0}},
+ wait_converge := true);
+
f_ConnHdlr_s1ap_unregister(g_pars.genb_id);
}
testcase TC_setup() runs on test_CT {
@@ -156,6 +170,19 @@
vc_conn := f_ConnHdlr_spawn(refers(f_TC_setup), pars);
vc_conn.done;
}
+
+function f_TC_setup_multi(charstring id) runs on ConnHdlr {
+ f_ConnHdlr_register_pfcp();
+ f_ConnHdlr_s1ap_register(g_pars.genb_id);
+
+ f_ConnHdlr_s1ap_connect(mp_enb_bind_ip, mp_s1gw_enb_ip);
+ f_ConnHdlr_s1ap_setup(g_pars.genb_id);
+ f_sleep(0.5); /* keep the connection idle for some time */
+
+ f_ConnHdlr_s1ap_disconnect();
+
+ f_ConnHdlr_s1ap_unregister(g_pars.genb_id);
+}
testcase TC_setup_multi() runs on test_CT {
var ConnHdlrList vc_conns := { };
@@ -163,7 +190,7 @@
for (var integer i := 0; i < 42; i := i + 1) {
var ConnHdlrPars pars := f_new_ConnHdlrPars(i);
- var ConnHdlr vc_conn := f_ConnHdlr_spawn(refers(f_TC_setup),
pars);
+ var ConnHdlr vc_conn :=
f_ConnHdlr_spawn(refers(f_TC_setup_multi), pars);
vc_conns := vc_conns & { vc_conn };
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37960?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Iae629bc9291ff8b6e482f61d692e4d97ff0136bd
Gerrit-Change-Number: 37960
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
