fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39079?usp=email )

Change subject: s1gw: add constants for PFCP FAR IDs ......................................................................

s1gw: add constants for PFCP FAR IDs

Change-Id: Ib25e5cc9ca21047f9884e1c13d0861bf4f7251a1 --- M s1gw/S1GW_ConnHdlr.ttcn 1 file changed, 8 insertions(+), 5 deletions(-)

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

diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index 4634064..b2b207d 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -299,6 +299,9 @@

private const S1AP_IEs.Cause c_REL_CMD_CAUSE := { nas := normal_release };

+private const LIN4_BO_LAST c_PFCP_FAR_ID_C2A := 1; /* Core -> Access */ +private const LIN4_BO_LAST c_PFCP_FAR_ID_A2C := 2; /* Access -> Core */ + function f_ConnHdlr_tx_erab_setup_req(in ERabList erabs) runs on ConnHdlr { var template (value) E_RABToBeSetupListBearerSUReq items; @@ -604,11 +607,11 @@ pdr1 := tr_PFCP_Create_PDR(pdr_id := 1, /* -- for Core -> Access */ pdi := tr_PFCP_PDI(CORE), ohr := ohr, - far_id := 1); + far_id := c_PFCP_FAR_ID_C2A); pdr2 := tr_PFCP_Create_PDR(pdr_id := 2, /* -- for Access -> Core */ pdi := tr_PFCP_PDI(ACCESS), ohr := ohr, - far_id := 2); + far_id := c_PFCP_FAR_ID_A2C);

/* Forwarding Action Rules */ var template (present) Outer_Header_Creation ohc2; @@ -620,10 +623,10 @@ f_inet_addr(erab.u2c.tla)); fpars2 := tr_PFCP_Forwarding_Parameters(CORE, ohc2);

- far1 := tr_PFCP_Create_FAR(far_id := 1, /* -- for Core -> Access */ + far1 := tr_PFCP_Create_FAR(far_id := c_PFCP_FAR_ID_C2A, /* -- for Core -> Access */ aa := tr_PFCP_Apply_Action_DROP, fp := omit); - far2 := tr_PFCP_Create_FAR(far_id := 2, /* -- for Access -> Core */ + far2 := tr_PFCP_Create_FAR(far_id := c_PFCP_FAR_ID_A2C, /* -- for Access -> Core */ aa := tr_PFCP_Apply_Action_FORW, fp := fpars2);

@@ -736,7 +739,7 @@ log("UPF <- S1GW: PFCP Session Modification Request for E-RAB ID ", erabs[i].erab_id); var PDU_PFCP pdu := f_ConnHdlr_rx_session_modify_req(epars := erabs[i].u2a, seid := erabs[i].pfcp_loc_seid, - far_id := 1); + far_id := c_PFCP_FAR_ID_C2A); log("UPF -> S1GW: PFCP Session Modification Response for E-RAB ID ", erabs[i].erab_id); f_ConnHdlr_tx_session_modify_resp(erabs[i], pdu); }