[S] Change in osmo-ttcn3-hacks[master]: GTPv1U_Emulation: Rename s/f_gtp1u_ping4/f_gtp1u_ping/

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42499?usp=email )

Change subject: GTPv1U_Emulation: Rename s/f_gtp1u_ping4/f_gtp1u_ping/ ......................................................................

GTPv1U_Emulation: Rename s/f_gtp1u_ping4/f_gtp1u_ping/

The function can also be (and is) used to ping IPv6 hosts.

Change-Id: I195cb048176aefddcb477083ddc949b86ec592fa --- M 5gc/ConnHdlr.ttcn M library/GTPv1U_Emulation.ttcnpp M pgw/PGW_Tests.ttcn 3 files changed, 13 insertions(+), 13 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/99/42499/1

diff --git a/5gc/ConnHdlr.ttcn b/5gc/ConnHdlr.ttcn index 5294b50..8f5e5c5 100644 --- a/5gc/ConnHdlr.ttcn +++ b/5gc/ConnHdlr.ttcn @@ -1406,7 +1406,7 @@ /* execute ping command and wait for result */ function f_ping(charstring host, integer interval := 1, integer count := 10) runs on ConnHdlr { - /* command will be filled in by f_gtp1u_ping4() below: */ + /* command will be filled in by f_gtp1u_ping() below: */ var UECUPS_StartProgram sprog := f_run_prog_init(""); var charstring bind_addr;

@@ -1416,14 +1416,14 @@ bind_addr := g_pars.ue_pars.sess_pars.ue_ip4; }

- f_gtp1u_ping4(sprog, host, interval, count, bind_addr, + f_gtp1u_ping(sprog, host, interval, count, bind_addr, redirect_output := true, redirect_output_path_prefix := f_run_prog_unique_log_path()); }

function f_ping_async(charstring host, integer interval := 1, integer count := 10) runs on ConnHdlr return integer { - /* command will be filled in by f_gtp1u_ping4() below: */ + /* command will be filled in by f_gtp1u_ping() below: */ var UECUPS_StartProgram sprog := f_run_prog_init(""); var charstring bind_addr;

@@ -1433,10 +1433,10 @@ bind_addr := g_pars.ue_pars.sess_pars.ue_ip4; }

- var integer pid := f_gtp1u_ping4_async(sprog, host, - interval, count, bind_addr, - redirect_output := true, - redirect_output_path_prefix := f_run_prog_unique_log_path()); + var integer pid := f_gtp1u_ping_async(sprog, host, + interval, count, bind_addr, + redirect_output := true, + redirect_output_path_prefix := f_run_prog_unique_log_path()); return pid; }

diff --git a/library/GTPv1U_Emulation.ttcnpp b/library/GTPv1U_Emulation.ttcnpp index 7b1db12..0d3abb8 100644 --- a/library/GTPv1U_Emulation.ttcnpp +++ b/library/GTPv1U_Emulation.ttcnpp @@ -502,7 +502,7 @@ f_gtp1u_wait_term(pid, exit_code, tout, port_idx); }

-function f_gtp1u_ping4_async(UECUPS_StartProgram sprog, +function f_gtp1u_ping_async(UECUPS_StartProgram sprog, charstring host, integer interval := 1, integer count := 10, template (omit) charstring src_ip := omit, boolean redirect_output := false, @@ -523,7 +523,7 @@ }

/* execute ping command and wait for result. sprog.command is filled in based on params. */ -function f_gtp1u_ping4(UECUPS_StartProgram sprog, +function f_gtp1u_ping(UECUPS_StartProgram sprog, charstring host, integer interval := 1, integer count := 10, template (omit) charstring src_ip := omit, boolean redirect_output := false, diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index fba057e..b3f104b 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -925,11 +925,11 @@ if (not isbound(g_ip4_addr)) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "f_ping4(): g_ip4_addr is unset!"); } - /* command will be filled in by f_gtp1u_ping4() below: */ + /* command will be filled in by f_gtp1u_ping() below: */ var UECUPS_StartProgram sprog := f_run_prog_init(""); - f_gtp1u_ping4(sprog, host, interval, count, f_inet_ntoa(g_ip4_addr), - redirect_output := true, - redirect_output_path_prefix := f_run_prog_unique_log_path()); + f_gtp1u_ping(sprog, host, interval, count, f_inet_ntoa(g_ip4_addr), + redirect_output := true, + redirect_output_path_prefix := f_run_prog_unique_log_path()); }

/* send echo request; expect response */