laforge submitted this change.

View Change


Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved
hnbgw: Provide proper params to set StatsD local ip/port

The StatsD init() function parameter names were misleading
(prefixed "dst_" while they are actualy "local_" ones).
As a result, the hnbgw test was passing the wrong values to it.

Change-Id: I213173c99ec314c2eebfb8836c4d3467b3a7f818
---
M hnbgw/HNBGW_Tests.ttcn
M library/StatsD_Checker.ttcn
2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn
index 578d35d..e28fecc 100644
--- a/hnbgw/HNBGW_Tests.ttcn
+++ b/hnbgw/HNBGW_Tests.ttcn
@@ -88,7 +88,10 @@
charstring mp_hnbgw_ip := "127.0.0.1";
integer mp_hnbgw_iuh_port := 29169;
integer mp_hnbgw_ctrl_port := 4262;
- integer mp_hnbgw_statsd_port := 8125;
+
+ /* Our emulated StatsD server: */
+ charstring mp_local_statsd_ip := "127.0.0.1";
+ integer mp_local_statsd_port := 8125;

charstring mp_mgw_ip := "127.0.0.1";
integer mp_mgw_port := 2427;
@@ -491,7 +494,7 @@
T_guard.start(guard_timeout);
activate(as_Tguard());

- f_init_statsd("VirtHNBGW", vc_STATSD, mp_hnbgw_ip, mp_hnbgw_statsd_port);
+ f_init_statsd("VirtHNBGW", vc_STATSD, mp_local_statsd_ip, mp_local_statsd_port);

/* RUA/RANAP emulation on top of lower-layer Iuh */
var RuaOps rua_ops := {
diff --git a/library/StatsD_Checker.ttcn b/library/StatsD_Checker.ttcn
index 8ace150..2ad4c9f 100644
--- a/library/StatsD_Checker.ttcn
+++ b/library/StatsD_Checker.ttcn
@@ -245,11 +245,11 @@
return seen_all;
}

-function f_init_statsd(charstring id, inout StatsD_Checker_CT vc_STATSD, charstring dst_addr, integer dst_port) {
+function f_init_statsd(charstring id, inout StatsD_Checker_CT vc_STATSD, charstring local_addr, integer local_port) {
id := id & "-STATS";

vc_STATSD := StatsD_Checker_CT.create(id);
- vc_STATSD.start(StatsD_Checker.main(dst_addr, dst_port));
+ vc_STATSD.start(StatsD_Checker.main(local_addr, local_port));
}



To view, visit change 36563. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I213173c99ec314c2eebfb8836c4d3467b3a7f818
Gerrit-Change-Number: 36563
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-MessageType: merged