laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38211?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: Revert "s1gw: cache PFCP Recovery Timestamp in ConnHdlr" ......................................................................

Revert "s1gw: cache PFCP Recovery Timestamp in ConnHdlr"

This reverts commit 7ad95e1cfb00d269069bd052c44a9cae9027f763.

A follow-up commit will remove the need for each ConnHdlr to call f_ConnHdlr_register_pfcp(), that among with handling the PFCP association retrieves a PFCP Recovery Timestamp from the PFCPEM.

Caching the PFCP Recovery Timestamp value is not really worth it, since it's rarely used and can always be retrieved on demand.

Change-Id: I3b1c488e3ec251c7659cd9bc3197cca2f9d03144 --- M s1gw/S1GW_ConnHdlr.ttcn M s1gw/S1GW_Tests.ttcn 2 files changed, 3 insertions(+), 5 deletions(-)

Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve

diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index 8d1a2b2..a5638f8 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -44,7 +44,6 @@ var ConnHdlrPars g_pars; port S1AP_CODEC_PT S1AP_ENB; var ConnectionId g_s1ap_conn_id := -1; - var integer g_pfcp_recovery_timestamp := -1; }; type record of ConnHdlr ConnHdlrList;

@@ -238,7 +237,7 @@ PFCP.send(ts_PFCP_Assoc_Setup_Resp(rx.sequence_number, ts_PFCP_Node_ID_fqdn("\07osmocom\03org"), ts_PFCP_Cause(REQUEST_ACCEPTED), - g_pfcp_recovery_timestamp)); + f_PFCPEM_get_recovery_timestamp())); }

function f_ConnHdlr_pfcp_expect(template (present) PDU_PFCP exp_rx := ?, @@ -266,8 +265,6 @@

function f_ConnHdlr_register_pfcp() runs on ConnHdlr { - g_pfcp_recovery_timestamp := f_PFCPEM_get_recovery_timestamp(); - /* First ConnHdlr answers the AssocSetup: */ if (g_pars.idx != 0) { activate(as_pfcp_ignore(PFCP, tr_PFCP_Assoc_Setup_Req())); diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index 2090478..8eadb66 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -314,12 +314,13 @@ }

function f_TC_pfcp_heartbeat(charstring id) runs on ConnHdlr { + var integer rts := f_PFCPEM_get_recovery_timestamp(); var PDU_PFCP pfcp_pdu;

f_ConnHdlr_register_pfcp();

/* Tx Heartbeat Request */ - PFCP.send(ts_PFCP_Heartbeat_Req(g_pfcp_recovery_timestamp)); + PFCP.send(ts_PFCP_Heartbeat_Req(rts));

/* Expect Heartbeat Response * TODO: validate the indicated Recovery Time Stamp against