January 2023 - gerrit-log - lists.osmocom.org

Change in osmo-upf[master]: manual: fix broken reference to netinst section

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/30923 ) Change subject: manual: fix broken reference to netinst section ...................................................................... manual: fix broken reference to netinst section Change-Id: Ifeee1e90eb2af0e5bff357a000189c047fda03fb --- M doc/manuals/chapters/netinst.adoc 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve neels: Looks good to me, approved diff --git a/doc/manuals/chapters/netinst.adoc b/doc/manuals/chapters/netinst.adoc index 3add2bb..d29c190 100644 --- a/doc/manuals/chapters/netinst.adoc +++ b/doc/manuals/chapters/netinst.adoc @@ -1,3 +1,4 @@ +[[netinst]] == Local GTP Addresses / Network Instance PFCP features optional Network Instance IEs, in which the CPF may tell the UPF which local network interface to use for -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/30923 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ifeee1e90eb2af0e5bff357a000189c047fda03fb Gerrit-Change-Number: 30923 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmo-upf[master]: manual: fix broken reference to netinst section

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/30923 ) Change subject: manual: fix broken reference to netinst section ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/30923 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ifeee1e90eb2af0e5bff357a000189c047fda03fb Gerrit-Change-Number: 30923 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Jan 2023 20:55:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: PFCP_Templates: add Session Modification templates

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30927 ) Change subject: PFCP_Templates: add Session Modification templates ...................................................................... PFCP_Templates: add Session Modification templates Related: SYS#6192 SYS#5599 Change-Id: Id9ca1eff44a4759d25b31f34ededfcc6074517d5 --- M library/PFCP_Templates.ttcn 1 file changed, 76 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/PFCP_Templates.ttcn b/library/PFCP_Templates.ttcn index 3f14a1f..4e58f32 100644 --- a/library/PFCP_Templates.ttcn +++ b/library/PFCP_Templates.ttcn @@ -371,13 +371,33 @@ } } +template (value) Update_Forwarding_Parameters ts_PFCP_Update_Forwarding_Parameters( + e_PFCP_Dest_Iface dest_iface, + template (omit) Outer_Header_Creation outer_header_creation := omit + ) := { + elementIdentifier := 11, + lengthIndicator := 0, + grouped_ie := { + destination_interface := ts_PFCP_Destination_Interface(dest_iface), + pdn_Instance := omit, + redirect_information := omit, + outer_header_creation := outer_header_creation, + transport_level_marking := omit, + forwarding_policy := omit, + header_enrichment := omit, + pfcpSMReq_flags := omit, + traffic_endpoint_id := omit + } +} + template (value) FAR_ID ts_PFCP_FAR_ID(LIN4_BO_LAST far_id) := { elementIdentifier := 108, lengthIndicator := 0, id_value := far_id } -template (value) Create_FAR ts_PFCP_Create_FAR(LIN4_BO_LAST far_id, template (value) Apply_Action aa, Forwarding_Parameters fp) := { +template (value) Create_FAR ts_PFCP_Create_FAR(LIN4_BO_LAST far_id, template (value) Apply_Action aa, + template (omit) Forwarding_Parameters fp) := { elementIdentifier := 3, lengthIndicator := 0, grouped_ie := { @@ -389,6 +409,19 @@ } } +template (value) Update_FAR ts_PFCP_Update_FAR(LIN4_BO_LAST far_id, template (value) Apply_Action aa, + template (omit) Update_Forwarding_Parameters fp) := { + elementIdentifier := 10, + lengthIndicator := 0, + grouped_ie := { + far_id := ts_PFCP_FAR_ID(far_id), + apply_action := aa, + forwarding_parameters := fp, + duplicating_parameters := omit, + bar_id := omit + } +} + template (value) PDR_ID ts_PFCP_PDR_ID(OCT2 pdr_id) := { elementIdentifier := 56, lengthIndicator := 0, @@ -493,6 +526,40 @@ return t; } +function ts_PFCP_Session_Mod_Req(OCT8 up_seid, Update_FAR update_far) + return template (value) PDU_PFCP { + var template (value) PDU_PFCP t := ts_PDU_PFCP(seid := up_seid); + t.message_body := { + pfcp_session_modification_request := { + f_seid := omit, + remove_PDR_list := omit, + remove_FAR_list := omit, + remove_URR_list := omit, + remove_QER_list := omit, + remove_BAR := omit, + remove_traffic_endpoint := omit, + create_PDR_list := omit, + create_FAR_list := omit, + create_URR_list := omit, + create_QER_list := omit, + create_BAR := omit, + create_traffic_endpoint := omit, + update_PDR_list := omit, + update_FAR_list := { update_far }, + update_URR_list := omit, + update_QER_list := omit, + update_BAR := omit, + update_traffic_endpoint := omit, + pfcpSMReq_flags := omit, + query_URR_list := omit, + node_list := omit, + up_inactivity_timer := omit, + querry_urr_reference := omit + } + }; + return t; +} + function tr_PFCP_Session_Mod_Req(template (present) OCT8 seid := ?) return template (present) PDU_PFCP { var template PDU_PFCP t := tr_PDU_PFCP(seid); t.message_body := { @@ -519,6 +586,14 @@ return t; } +function tr_PFCP_Session_Mod_Resp(template (present) OCT8 seid := ?) return template (present) PDU_PFCP { + var template PDU_PFCP t := tr_PDU_PFCP(seid); + t.message_body := { + pfcp_session_modification_response := ? + }; + return t; +} + function ts_PFCP_Session_Del_Req(OCT8 seid) return template (value) PDU_PFCP { var template (value) PDU_PFCP t := ts_PDU_PFCP(seid := seid); t.message_body := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id9ca1eff44a4759d25b31f34ededfcc6074517d5 Gerrit-Change-Number: 30927 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: PFCP: add support for Network Instance IE

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30928 ) Change subject: PFCP: add support for Network Instance IE ...................................................................... PFCP: add support for Network Instance IE Related: SYS#6192 Change-Id: Iba8d423cd91e73ea40139a5b58c4e22f1a741dc1 --- M library/PFCP_Templates.ttcn 1 file changed, 24 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/PFCP_Templates.ttcn b/library/PFCP_Templates.ttcn index 4e58f32..3acc287 100644 --- a/library/PFCP_Templates.ttcn +++ b/library/PFCP_Templates.ttcn @@ -273,15 +273,34 @@ choose_id := choose_id } +/* Convert plain Network Instance name to encoded (length-byte + "name") format. + * Works only for single-label names, i.e. no dots in the name. */ +private function f_netinst_str_to_qname(charstring name) return octetstring +{ + var octetstring qname := int2oct(lengthof(name), 1) & char2oct(name); + return qname; +} + +function ts_PFCP_Network_Instance(charstring netinst_name) return Network_Instance +{ + var Network_Instance netinst := { + elementIdentifier := 22, + lengthIndicator := 0, + pdn_instance := f_netinst_str_to_qname(netinst_name) + } + return netinst; +} + template (value) PDI_IE ts_PFCP_PDI(e_PFCP_Src_Iface src_iface, template (omit) F_TEID local_F_TEID := omit, - template (omit) UE_IP_Address ue_addr_v4 := omit) := { + template (omit) UE_IP_Address ue_addr_v4 := omit, + template (omit) Network_Instance network_instance := omit) := { elementIdentifier := 2, lengthIndicator := 0, grouped_ie := { source_interface := ts_PFCP_Src_Iface(src_iface), local_F_TEID := local_F_TEID, - pdn_instance := omit, + pdn_instance := network_instance, ue_ip_address := ue_addr_v4, traffic_endpoint_id := omit, sdf_filter_list := omit, @@ -355,13 +374,14 @@ template (value) Forwarding_Parameters ts_PFCP_Forwarding_Parameters( e_PFCP_Dest_Iface dest_iface, - template (omit) Outer_Header_Creation outer_header_creation := omit + template (omit) Outer_Header_Creation outer_header_creation := omit, + template (omit) Network_Instance network_instance := omit ) := { elementIdentifier := 4, lengthIndicator := 0, grouped_ie := { destination_interface := ts_PFCP_Destination_Interface(dest_iface), - pdn_Instance := omit, + pdn_Instance := network_instance, redirect_information := omit, outer_header_creation := outer_header_creation, transport_level_marking := omit, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iba8d423cd91e73ea40139a5b58c4e22f1a741dc1 Gerrit-Change-Number: 30928 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: upf: test Session Mod, test Network Instance

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30929 ) Change subject: upf: test Session Mod, test Network Instance ...................................................................... upf: test Session Mod, test Network Instance Add tests and enhance the upf test suite to be closer to real world usage: - properly verify the F-TEIDs chosen by osmo-upf. - add tests with two-step session creation, i.e. with a Session Establishment followed by Session Modification indicating the remote F-TEID to use on the core side, as is the usual case. - Add module parameters for network instances to use in the test; dynamically configure osmo-upf's "netinst" config via VTY. - pass Network Instance in Create PDR, verify that osmo-upf returns the matching GTP IP addresses in Created PDR. Related: SYS#6192 SYS#5599 Change-Id: I440466f1cc9689391869ac2579a4497ef6008adb --- M upf/CPF_ConnectionHandler.ttcn M upf/UPF_Tests.ttcn M upf/osmo-upf.cfg 3 files changed, 442 insertions(+), 33 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/upf/CPF_ConnectionHandler.ttcn b/upf/CPF_ConnectionHandler.ttcn index 25f99b9..f983ff0 100644 --- a/upf/CPF_ConnectionHandler.ttcn +++ b/upf/CPF_ConnectionHandler.ttcn @@ -47,11 +47,6 @@ return int2oct(g_next_seid_state, 8); } -function f_next_local_teid() runs on CPF_ConnHdlr return OCT4 { - g_next_local_teid_state := g_next_local_teid_state + 1; - return int2oct(g_next_local_teid_state, 4); -} - function f_next_remote_teid() runs on CPF_ConnHdlr return OCT4 { g_next_remote_teid_state := g_next_remote_teid_state + 1; return int2oct(g_next_remote_teid_state, 4); diff --git a/upf/UPF_Tests.ttcn b/upf/UPF_Tests.ttcn index b5c65d2..5db143a 100644 --- a/upf/UPF_Tests.ttcn +++ b/upf/UPF_Tests.ttcn @@ -42,6 +42,11 @@ charstring mp_pfcp_ip_upf := "127.0.0.1"; charstring mp_pfcp_ip_local := "127.0.0.2"; + charstring mp_netinst_access_ip_1 := "127.0.1.1"; + charstring mp_netinst_access_ip_2 := "127.0.1.2"; + charstring mp_netinst_core_ip_1 := "127.0.2.1"; + charstring mp_netinst_core_ip_2 := "127.0.2.2"; + /* When testing with gtp mockup, actions will not show. */ boolean mp_verify_gtp_actions := false; } @@ -162,13 +167,60 @@ GTP_Action gtp } +/* _r and _l means 'remote' and 'local', from the perspective of the osmo-upf process. */ +type record GTP_Action_tunend { + /* the PDR Id detecting packets from this side */ + integer pdr_id, + /* IP packets arriving from this side are arriving on ip_l */ + charstring ip_l, + + /* the FAR Id forwarding packets to this side */ + integer far_id +} + +/* _r and _l means 'remote' and 'local', from the perspective of the osmo-upf process. */ +type record GTP_Action_tun { + /* the PDR Id detecting packets from this side */ + integer pdr_id, + /* GTP arriving from this side is arriving on gtp_ip_l with teid_l */ + charstring gtp_ip_l, + OCT4 teid_l, + + /* the FAR Id forwarding packets to this side */ + integer far_id, + /* GTP going out to this side should be sent to gtp_ip_r with teid_r */ + charstring gtp_ip_r, + OCT4 teid_r +} + +type union GTP_Action_core { + /* For kind = "tunend", the local IP that the UE has on 'the internet' */ + GTP_Action_tunend tunend, + /* For kind = "tunmap", the second GTP tunnel */ + GTP_Action_tun tunmap +} + +/* State of what GTP functionality osmo-upf should put in place, after a PFCP request was ACKed by it. + * _r and _l means 'remote' and 'local', from the perspective of the osmo-upf process. + * + * tunend: + * Access UPF Core + * GTP-r:127.0.0.2,0x1 <-FAR-1-- | 192.168.0.1 <-PDR-1-- + * --PDR-2-> GTP-l:127.0.0.1,0x2 | --FAR-2-> (IP destination is in each GTP payload) + * + * tunmap: + * Access UPF Core + * GTP-r:127.0.0.2,0x1 <-FAR-1-- | 127.0.0.1,0x1 <-PDR-1-- + * --PDR-2-> GTP-l:127.0.0.1,0x2 | --FAR-2-> GTP-r:127.0.0.3,0x2 + */ type record GTP_Action { /* kind = ("tunend"|"tunmap") */ charstring kind, - charstring gtp_access_ip, - OCT4 teid_access_r, - OCT4 teid_access_l, - charstring core_ip, + /* The access side GTP tunnel. (The 'Access' side is always GTP.) */ + GTP_Action_tun access, + /* The core side GTP tunnel (tunmap) or local IP (tunend) */ + GTP_Action_core core, + /* Reference to the PFCP Session that created this GTP action: PFCP session's F-SEID as seen from osmo-upf */ charstring pfcp_peer, OCT8 seid_l }; @@ -176,17 +228,26 @@ type record of GTP_Action GTP_Action_List; private function f_parse_gtp_action(out GTP_Action ret, charstring str) return boolean { + /* Parse a string like + * "GTP:tunend GTP-access-r:127.0.0.2 TEID-access-r:0x94f0001 TEID-access-l:0x1 IP-core-l:192.168.44.241 PFCP-peer:127.0.0.2 SEID-l:0x1 PDR:1,2" + */ var GTP_Action a; if (not f_get_name_val(a.kind, str, "GTP")) { return false; } - if (not f_get_name_val(a.gtp_access_ip, str, "GTP-access")) { + if (not f_get_name_val(a.access.gtp_ip_r, str, "GTP-access-r")) { return false; } - if (not f_get_name_val_oct4(a.teid_access_r, str, "TEID-r")) { + if (not f_get_name_val_oct4(a.access.teid_r, str, "TEID-access-r")) { return false; } - if (not f_get_name_val_oct4(a.teid_access_l, str, "TEID-l")) { + if (not f_get_name_val(a.access.gtp_ip_l, str, "GTP-access-l")) { + return false; + } + if (not f_get_name_val_oct4(a.access.teid_l, str, "TEID-access-l")) { + return false; + } + if (not f_get_name_val_int(a.access.pdr_id, str, "PDR-access")) { return false; } if (not f_get_name_val(a.pfcp_peer, str, "PFCP-peer")) { @@ -195,9 +256,39 @@ if (not f_get_name_val_oct8(a.seid_l, str, "SEID-l")) { return false; } - if (not f_get_name_val(a.core_ip, str, "IP-core")) { - return false; + if (a.kind == "tunend") { + if (not f_get_name_val_int(a.core.tunend.pdr_id, str, "PDR-core")) { + return false; + } + if (not f_get_name_val(a.core.tunend.ip_l, str, "IP-core-l")) { + return false; + } + /* in these tests, the PDR Id and its FAR Id are always the same: PDR for incoming on Access matches its + * FAR that forwards to Core. */ + a.core.tunend.far_id := a.access.pdr_id; + a.access.far_id := a.core.tunend.pdr_id; + } else if (a.kind == "tunmap") { + if (not f_get_name_val(a.core.tunmap.gtp_ip_r, str, "GTP-core-r")) { + return false; + } + if (not f_get_name_val_oct4(a.core.tunmap.teid_r, str, "TEID-core-r")) { + return false; + } + if (not f_get_name_val(a.core.tunmap.gtp_ip_l, str, "GTP-core-l")) { + return false; + } + if (not f_get_name_val_oct4(a.core.tunmap.teid_l, str, "TEID-core-l")) { + return false; + } + if (not f_get_name_val_int(a.core.tunmap.pdr_id, str, "PDR-core")) { + return false; + } + /* in these tests, the PDR Id and its FAR Id are always the same: PDR for incoming on Access matches its + * FAR that forwards to Core. */ + a.core.tunmap.far_id := a.access.pdr_id; + a.access.far_id := a.core.tunmap.pdr_id; } + ret := a; return true; } @@ -417,6 +508,16 @@ setverdict(pass); } +private function f_vty_netinst_cfg(TELNETasp_PT vty_pt, ro_charstring netinst_cmds) +{ + f_vty_enter_config(vty_pt); + f_vty_transceive(vty_pt, "netinst"); + for (var integer i := 0; i < lengthof(netinst_cmds); i := i + 1) { + f_vty_transceive(vty_pt, netinst_cmds[i]); + } + f_vty_transceive_ret(vty_pt, "end"); +} + function f_init_vty(charstring id := "foo") runs on test_CT { if (UPFVTY.checkstate("Mapped")) { /* skip initialization if already executed once */ @@ -435,6 +536,15 @@ activate(as_Tguard()); f_init_vty("VirtCPF"); + + /* Clear out and set up default network instance config */ + f_vty_netinst_cfg(UPFVTY, + { "clear", + "add access " & mp_netinst_access_ip_1, + "add access2 " & mp_netinst_access_ip_2, + "add core " & mp_netinst_core_ip_1, + "add core2 " & mp_netinst_core_ip_2 + }); } friend function f_shutdown_helper() runs on test_CT { @@ -500,6 +610,7 @@ PFCP.receive(tr_PFCP_Assoc_Release_Resp(cause := tr_PFCP_Cause(REQUEST_ACCEPTED))); } +/* Collection of what a test intends to send to osmo-upf */ type record PFCP_Ruleset { Create_PDR_list pdr, Create_FAR_list far @@ -508,17 +619,18 @@ /* Add to r a rule set that does GTP decapsulation (half of encapsulation/decapsulation): * Receive GTP on src_iface = ACCESS by a local F-TEID to be chosen by osmo-upf. * Dispatch GTP payload as plain IP on dest_iface = CORE. */ -private function f_ruleset_add_GTP_decaps(inout PFCP_Ruleset r) { - var integer pdr_id := lengthof(r.pdr) + 1; - var integer far_id := lengthof(r.far) + 1; - +private function f_ruleset_add_GTP_decaps(inout PFCP_Ruleset r, + integer pdr_id, + charstring src_netinst, + integer far_id) { r.pdr := r.pdr & { valueof( ts_PFCP_Create_PDR( pdr_id, ts_PFCP_PDI( ACCESS, - local_F_TEID := ts_PFCP_F_TEID_choose_v4()), + local_F_TEID := ts_PFCP_F_TEID_choose_v4(), + network_instance := ts_PFCP_Network_Instance(src_netinst)), ts_PFCP_Outer_Header_Removal(GTP_U_UDP_IPV4), far_id ) @@ -537,13 +649,11 @@ /* Add to r a rule set that does GTP encapsulation (half of encapsulation/decapsulation) */ private function f_ruleset_add_GTP_encaps(inout PFCP_Ruleset r, + integer pdr_id, charstring ue_addr_v4 := "192.168.23.42", + integer far_id, OCT4 remote_teid, OCT4 gtp_dest_addr_v4) { - - var integer pdr_id := lengthof(r.pdr) + 1; - var integer far_id := lengthof(r.far) + 1; - r.pdr := r.pdr & { valueof( ts_PFCP_Create_PDR( @@ -572,6 +682,87 @@ }; } +/* Add to r a rule set that forwards GTP from one tunnel to another, i.e. one direction of a tunmap */ +private function f_ruleset_add_GTP_forw(inout PFCP_Ruleset r, + integer pdr_id, + e_PFCP_Src_Iface src_iface, + charstring src_netinst, + integer far_id, + e_PFCP_Dest_Iface dest_iface, + F_TEID dest_remote_f_teid) { + r.pdr := r.pdr & { + valueof( + ts_PFCP_Create_PDR( + pdr_id, + ts_PFCP_PDI( + src_iface, + local_F_TEID := ts_PFCP_F_TEID_choose_v4(), + network_instance := ts_PFCP_Network_Instance(src_netinst)), + ts_PFCP_Outer_Header_Removal(GTP_U_UDP_IPV4), + far_id + ) + ) + }; + r.far := r.far & { + valueof( + ts_PFCP_Create_FAR( + far_id, + ts_PFCP_Apply_Action_FORW(), + valueof(ts_PFCP_Forwarding_Parameters(dest_iface, + ts_PFCP_Outer_Header_Creation_GTP_ipv4(dest_remote_f_teid.teid, + dest_remote_f_teid.ipv4_address))) + ) + ) + }; +} + +/* Add to r a DROP rule from src_iface to dest_iface */ +private function f_ruleset_add_GTP_drop(inout PFCP_Ruleset r, + integer pdr_id, + e_PFCP_Src_Iface src_iface, + charstring src_netinst, + integer far_id, + e_PFCP_Dest_Iface dest_iface) { + r.pdr := r.pdr & { + valueof( + ts_PFCP_Create_PDR( + pdr_id, + ts_PFCP_PDI( + src_iface, + local_F_TEID := ts_PFCP_F_TEID_choose_v4(), + network_instance := ts_PFCP_Network_Instance(src_netinst)), + ts_PFCP_Outer_Header_Removal(GTP_U_UDP_IPV4), + far_id + ) + ) + }; + r.far := r.far & { + valueof( + ts_PFCP_Create_FAR( + far_id, + ts_PFCP_Apply_Action_DROP, + fp := omit + ) + ) + }; +} + +private function f_tunmap_upd_far_to_core(GTP_Action gtp) return Update_FAR +{ + return valueof( + ts_PFCP_Update_FAR( + gtp.core.tunmap.far_id, + ts_PFCP_Apply_Action_FORW(), + valueof(ts_PFCP_Update_Forwarding_Parameters( + CORE, + ts_PFCP_Outer_Header_Creation_GTP_ipv4(gtp.core.tunmap.teid_r, + f_inet_addr(gtp.core.tunmap.gtp_ip_r)) + ) + ) + ) + ); +} + /* Return two PDR+FAR rulesets that involve a src=CP-Function. Such rulesets are emitted by certain third party CPF, and * osmo-upf should ACK the creation but ignore the rules (no-op). This function models rulesets seen in the field, so we * can confirm that osmo-upf ACKs and ignores. */ @@ -630,18 +821,87 @@ return r; } -/* Return a rule set that does GTP encapsulation/decapsulation */ -private function f_ruleset_tunend(GTP_Action gtp) return PFCP_Ruleset +/* Return a rule set that does GTP encapsulation and decapsulation, in both directions. */ +private function f_ruleset_tunend(GTP_Action gtp, charstring netinst_access := "access") return PFCP_Ruleset { var PFCP_Ruleset rules := { {}, {} }; - f_ruleset_add_GTP_decaps(rules); - f_ruleset_add_GTP_encaps(rules, gtp.core_ip, gtp.teid_access_r, f_inet_addr(gtp.gtp_access_ip)); + f_ruleset_add_GTP_decaps(rules, + pdr_id := gtp.access.pdr_id, + src_netinst := netinst_access, + far_id := gtp.core.tunend.far_id); + f_ruleset_add_GTP_encaps(rules, + gtp.core.tunend.pdr_id, + gtp.core.tunend.ip_l, + gtp.access.far_id, + gtp.access.teid_r, + f_inet_addr(gtp.access.gtp_ip_r)); return rules; } -/* Run a PFCP Session Establishment procedure */ -private function f_session_est(inout PFCP_session s, PFCP_Ruleset rules) runs on CPF_ConnHdlr { +/* Return a rule set that does GTP tunnel forwarding in both directions. + * If core_gtp_known == true, place full FORW rules in both directions. + * If core_gtp_known == false, keep the Core side as DROP: this allows testing the usual/realistic case, where upon + * Session Establishment, the core side PGW has not yet provided the destination GTP F-TEID, which will follow later in + * a Session Modification. (This test suite has already configured which GTP F-TEID will be used on the core side, but + * we're omitting it from Session Establishment, until it is time to use it in f_session_mod()). */ +private function f_ruleset_tunmap(GTP_Action gtp, boolean core_gtp_known := true, + charstring netinst_access := "access", + charstring netinst_core := "core") return PFCP_Ruleset +{ + var PFCP_Ruleset rules := { {}, {} }; + /* Access to Core */ + if (core_gtp_known) { + f_ruleset_add_GTP_forw(rules, + pdr_id := gtp.access.pdr_id, + src_iface := ACCESS, + src_netinst := netinst_access, + far_id := gtp.core.tunmap.far_id, + dest_iface := CORE, + dest_remote_f_teid := valueof(ts_PFCP_F_TEID_ipv4(gtp.core.tunmap.teid_r, + f_inet_addr(gtp.core.tunmap.gtp_ip_r)))); + } else { + /* The Core remote GTP will follow in a Session Modification, for now set Core->Access to DROP */ + f_ruleset_add_GTP_drop(rules, + pdr_id := gtp.access.pdr_id, + src_iface := ACCESS, + src_netinst := netinst_access, + far_id := gtp.core.tunmap.far_id, + dest_iface := CORE); + } + /* Core to Access */ + f_ruleset_add_GTP_forw(rules, + pdr_id := gtp.core.tunmap.pdr_id, + src_iface := CORE, + src_netinst := netinst_core, + far_id := gtp.access.far_id, + dest_iface := ACCESS, + dest_remote_f_teid := valueof(ts_PFCP_F_TEID_ipv4(gtp.access.teid_r, + f_inet_addr(gtp.access.gtp_ip_r)))); + return rules; +} +/* From a PFCP Session Establishment Response, retrieve the F_TEID returned in the Created PDR IE for the given PDR Id + */ +private function f_get_created_local_f_teid(PDU_PFCP sess_est_resp, integer pdr_id) return F_TEID +{ + for (var integer i := 0; + i < lengthof(sess_est_resp.message_body.pfcp_session_establishment_response.created_PDR_list); + i := i + 1) { + var Created_PDR cpdr := sess_est_resp.message_body.pfcp_session_establishment_response.created_PDR_list[i]; + if (oct2int(cpdr.grouped_ie.pdr_id.rule_id) != pdr_id) { + continue; + } + log("osmo-upf has chosen local F-TEID: PDR-" & int2str(pdr_id) & " = ", cpdr.grouped_ie.local_F_TEID); + return cpdr.grouped_ie.local_F_TEID; + } + setverdict(fail, "PDR Id " & int2str(pdr_id) & " not found in PFCP message"); + mtc.stop; +} + +/* Run a PFCP Session Establishment procedure */ +private function f_session_est(inout PFCP_session s, PFCP_Ruleset rules) runs on CPF_ConnHdlr +{ + log("f_session_est: rules = ", rules); PFCP.send(ts_PFCP_Session_Est_Req(ts_PFCP_Node_ID_ipv4(f_inet_addr(g_pars.local_addr)), ts_PFCP_F_SEID_ipv4(f_inet_addr(g_pars.local_addr), s.cp_seid), rules.pdr, rules.far)); @@ -650,9 +910,27 @@ PFCP.receive(tr_PFCP_Session_Est_Resp(s.cp_seid)) -> value pfcp; s.up_seid := pfcp.message_body.pfcp_session_establishment_response.UP_F_SEID.seid; s.gtp.seid_l := s.up_seid; + + var F_TEID access_local_f_teid := f_get_created_local_f_teid(pfcp, s.gtp.access.pdr_id); + s.gtp.access.gtp_ip_l := f_inet_ntoa(access_local_f_teid.ipv4_address); + s.gtp.access.teid_l := access_local_f_teid.teid; + + if (ischosen(s.gtp.core.tunmap)) { + var F_TEID core_local_f_teid := f_get_created_local_f_teid(pfcp, s.gtp.core.tunmap.pdr_id); + s.gtp.core.tunmap.gtp_ip_l := f_inet_ntoa(core_local_f_teid.ipv4_address); + s.gtp.core.tunmap.teid_l := core_local_f_teid.teid; + } log("established PFCP session: ", s); } +/* Run a PFCP Session Modification procedure */ +private function f_session_mod(inout PFCP_session s) runs on CPF_ConnHdlr +{ + PFCP.send(ts_PFCP_Session_Mod_Req(s.up_seid, f_tunmap_upd_far_to_core(s.gtp))); + PFCP.receive(tr_PFCP_Session_Mod_Resp(s.cp_seid)); + log("modified PFCP session: ", s); +} + private function f_create_PFCP_session_tunend() runs on CPF_ConnHdlr return PFCP_session { var PFCP_session s := { @@ -660,12 +938,60 @@ cp_seid := f_next_seid(), gtp := { kind := "tunend", - gtp_access_ip := "127.0.0.2", - teid_access_r := f_next_remote_teid(), - teid_access_l := f_next_local_teid(), - core_ip := f_next_ue_addr(), + access := { + pdr_id := 1, + /* gtp_ip_l and teid_l will be returned by Session Establishment Response, Created PDR */ + gtp_ip_l := "", + teid_l := '00000000'O, + far_id := 2, + gtp_ip_r := "127.0.0.2", + teid_r := f_next_remote_teid() + }, + core := { + tunend := { + pdr_id := 2, + ip_l := f_next_ue_addr(), + far_id := 1 + } + }, pfcp_peer := g_pars.local_addr, seid_l := '0000000000000000'O + /* seid_l will be returned by Session Establishment Response */ + } + }; + return s; +} + +private function f_create_PFCP_session_tunmap() runs on CPF_ConnHdlr return PFCP_session +{ + var PFCP_session s := { + up_seid := -, + cp_seid := f_next_seid(), + gtp := { + kind := "tunmap", + access := { + pdr_id := 1, + /* gtp_ip_l and teid_l will be returned by Session Establishment Response, Created PDR */ + gtp_ip_l := "", + teid_l := '00000000'O, + far_id := 2, + gtp_ip_r := "127.0.0.2", + teid_r := f_next_remote_teid() + }, + core := { + tunmap := { + pdr_id := 2, + /* gtp_ip_l and teid_l will be returned by Session Establishment Response, Created PDR */ + gtp_ip_l := "", + teid_l := '00000000'O, + far_id := 1, + gtp_ip_r := "127.0.0.3", + teid_r := f_next_remote_teid() + } + }, + pfcp_peer := g_pars.local_addr, + seid_l := '0000000000000000'O + /* seid_l will be returned by Session Establishment Response */ } }; return s; @@ -778,12 +1104,98 @@ f_shutdown_helper(); } +/* Verify that the Network Instance IE in Create PDR chooses the right local address for a tunmap session */ +private function f_tc_session_est_tunmap(charstring id) runs on CPF_ConnHdlr { + f_assoc_setup(); + var PFCP_session s := f_create_PFCP_session_tunmap(); + f_session_est(s, f_ruleset_tunmap(s.gtp)); + f_sleep(1.0); + f_vty_expect_session_active(UPFVTY, s); + f_session_del(s); + f_vty_expect_no_active_sessions(UPFVTY); + f_vty_expect_no_gtp_actions(UPFVTY); + f_assoc_release(); + setverdict(pass); +} +testcase TC_session_est_tunmap() runs on test_CT { + var CPF_ConnHdlr vc_conn; + + f_init(guard_timeout := 15.0); + + vc_conn := f_start_handler(refers(f_tc_session_est_tunmap)); + vc_conn.done; + f_shutdown_helper(); +} + +/* Set up a tunmap session with a partial Session Establishment, followed by a Session Modification to complete it. */ +private function f_session_est_mod_tunmap(charstring netinst_access, charstring expect_gtp_ip_access, + charstring netinst_core, charstring expect_gtp_ip_core) runs on CPF_ConnHdlr { + f_assoc_setup(); + var PFCP_session s := f_create_PFCP_session_tunmap(); + f_session_est(s, f_ruleset_tunmap(s.gtp, core_gtp_known := false, + netinst_access := netinst_access, netinst_core := netinst_core)); + /* The locally chosen GTP IP addresses where osmo-upf receives GTP traffic were chosen by netinst_access / + * netinst_core and are returned in s.gtp.access.gtp_ip_l / s.gtp.core.tunmap.gtp_ip_l. Verify that the netinst + * names have returned their matching IP addresses. */ + if (s.gtp.access.gtp_ip_l != expect_gtp_ip_access) { + setverdict(fail, "Network Instance '" & netinst_access & "' should have yielded GTP IP " & + expect_gtp_ip_access & " but osmo-upf chose " & s.gtp.access.gtp_ip_l); + mtc.stop; + } + if (s.gtp.core.tunmap.gtp_ip_l != expect_gtp_ip_core) { + setverdict(fail, "Network Instance '" & netinst_core & "' should have yielded GTP IP " & + expect_gtp_ip_core & " but osmo-upf chose " & s.gtp.core.tunmap.gtp_ip_l); + mtc.stop; + } + + f_sleep(1.0); + f_vty_expect_session_status(UPFVTY, s, PFCP_session_inactive); + + f_session_mod(s); + f_sleep(1.0); + f_vty_expect_session_active(UPFVTY, s); + f_session_del(s); + f_vty_expect_no_active_sessions(UPFVTY); + f_vty_expect_no_gtp_actions(UPFVTY); + f_assoc_release(); + setverdict(pass); +} +/* Run f_session_est_mod_tunmap() with the first Network Instances */ +private function f_tc_session_est_mod_tunmap(charstring id) runs on CPF_ConnHdlr { + f_session_est_mod_tunmap("access", mp_netinst_access_ip_1, "core", mp_netinst_core_ip_1); +} +/* Run f_session_est_mod_tunmap() with the second Network Instances */ +private function f_tc_session_est_mod_tunmap2(charstring id) runs on CPF_ConnHdlr { + f_session_est_mod_tunmap("access2", mp_netinst_access_ip_2, "core2", mp_netinst_core_ip_2); +} +testcase TC_session_est_mod_tunmap() runs on test_CT { + var CPF_ConnHdlr vc_conn; + + f_init(guard_timeout := 15.0); + + vc_conn := f_start_handler(refers(f_tc_session_est_mod_tunmap)); + vc_conn.done; + f_shutdown_helper(); +} +testcase TC_session_est_mod_tunmap2() runs on test_CT { + var CPF_ConnHdlr vc_conn; + + f_init(guard_timeout := 15.0); + + vc_conn := f_start_handler(refers(f_tc_session_est_mod_tunmap2)); + vc_conn.done; + f_shutdown_helper(); +} + control { execute( TC_assoc_node_id_v4() ); execute( TC_assoc_node_id_fqdn() ); execute( TC_session_est_tunend() ); execute( TC_session_term_by_assoc_rel() ); execute( TC_session_est_noop() ); + execute( TC_session_est_tunmap() ); + execute( TC_session_est_mod_tunmap() ); + execute( TC_session_est_mod_tunmap2() ); } } diff --git a/upf/osmo-upf.cfg b/upf/osmo-upf.cfg index f84a4ae..c354d8d 100644 --- a/upf/osmo-upf.cfg +++ b/upf/osmo-upf.cfg @@ -14,3 +14,5 @@ mockup nft mockup +#netinst +# the netinst cfg is cleared and setup dynamically in UPF_Tests.ttcn -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I440466f1cc9689391869ac2579a4497ef6008adb Gerrit-Change-Number: 30929 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: upf: tweak f_ruleset_add_GTP_decaps

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30925 ) Change subject: upf: tweak f_ruleset_add_GTP_decaps ...................................................................... upf: tweak f_ruleset_add_GTP_decaps Improve function doc. Always use F-TEID = CHOOSE. Related: SYS#6192 SYS#5599 Change-Id: Ic88075001c1a7c3bd724ff8d618cef1dbd7423b7 --- M upf/UPF_Tests.ttcn 1 file changed, 6 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/upf/UPF_Tests.ttcn b/upf/UPF_Tests.ttcn index 8382943..796dc16 100644 --- a/upf/UPF_Tests.ttcn +++ b/upf/UPF_Tests.ttcn @@ -505,9 +505,10 @@ Create_FAR_list far }; -/* Add to r a rule set that does GTP decapsulation (half of encapsulation/decapsulation) */ -private function f_ruleset_add_GTP_decaps(inout PFCP_Ruleset r, - template F_TEID local_f_teid := omit) { +/* Add to r a rule set that does GTP decapsulation (half of encapsulation/decapsulation): + * Receive GTP on src_iface = ACCESS by a local F-TEID to be chosen by osmo-upf. + * Dispatch GTP payload as plain IP on dest_iface = CORE. */ +private function f_ruleset_add_GTP_decaps(inout PFCP_Ruleset r) { var integer pdr_id := lengthof(r.pdr) + 1; var integer far_id := lengthof(r.far) + 1; @@ -517,7 +518,7 @@ pdr_id, ts_PFCP_PDI( ACCESS, - local_F_TEID := local_f_teid), + local_F_TEID := ts_PFCP_F_TEID_choose_v4()), ts_PFCP_Outer_Header_Removal(GTP_U_UDP_IPV4), far_id ) @@ -633,7 +634,7 @@ private function f_ruleset_tunend(GTP_Action gtp) return PFCP_Ruleset { var PFCP_Ruleset rules := { {}, {} }; - f_ruleset_add_GTP_decaps(rules, ts_PFCP_F_TEID_choose_v4()); + f_ruleset_add_GTP_decaps(rules); f_ruleset_add_GTP_encaps(rules, gtp.core_ip, gtp.teid_access_r, gtp.gtp_access_ip); return rules; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30925 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic88075001c1a7c3bd724ff8d618cef1dbd7423b7 Gerrit-Change-Number: 30925 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: upf/PFCP: do not imply f_inet_addr()

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30926 ) Change subject: upf/PFCP: do not imply f_inet_addr() ...................................................................... upf/PFCP: do not imply f_inet_addr() PFCP_Templates.ttcn is not the place to do the conversion between string and OCT4. When I wanted to use an OCT4 address in some ts_PFCP_* template, it dawned on me that it is stupid to convert the OCT4 to a string, just so that the ts_PFCP_* template converts it back to OCT4. Related: SYS#6192 SYS#5599 Change-Id: Ib068831787f4256f70a2189a5f36ca1ea1f40c9e --- M hnbgw/HNBGW_Tests.ttcn M library/PFCP_Templates.ttcn M upf/UPF_Tests.ttcn 3 files changed, 24 insertions(+), 19 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve neels: Looks good to me, approved dexter: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index d77a18f..d76ff9d 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -18,6 +18,7 @@ import from GSM_Types all; import from Osmocom_Types all; import from IPL4asp_Types all; +import from Native_Functions all; import from Osmocom_CTRL_Functions all; import from Osmocom_CTRL_Types all; @@ -1314,7 +1315,7 @@ /* Acting as UPF, invent a new PFCP SEID to send to HNBGW. Respond to the Session Establishment. * The PFCP response must have the same sequence_number as the request. */ - var F_SEID up_f_seid := valueof(ts_PFCP_F_SEID_ipv4("127.0.0.1", '1111111111111111'O)); + var F_SEID up_f_seid := valueof(ts_PFCP_F_SEID_ipv4(f_inet_addr("127.0.0.1"), '1111111111111111'O)); var template PDU_PFCP r := ts_PFCP_Session_Est_Resp(m.sequence_number, upf_node_id, hnbgw_f_seid.seid); r.message_body.pfcp_session_establishment_response := { offending_ie := omit, @@ -1322,10 +1323,10 @@ created_PDR_list := { ts_PFCP_Created_PDR(pdr_id := serq.create_PDR_list[0].grouped_ie.pdr_id, local_F_TEID := ts_PFCP_F_TEID_ipv4(gtp_pars.core.local.teid, - gtp_pars.core.local.addr)), + f_inet_addr(gtp_pars.core.local.addr))), ts_PFCP_Created_PDR(pdr_id := serq.create_PDR_list[1].grouped_ie.pdr_id, local_F_TEID := ts_PFCP_F_TEID_ipv4(gtp_pars.access.local.teid, - gtp_pars.access.local.addr)) + f_inet_addr(gtp_pars.access.local.addr))) }, load_control_information := omit, overload_control_information := omit, diff --git a/library/PFCP_Templates.ttcn b/library/PFCP_Templates.ttcn index d0e8b67..3f14a1f 100644 --- a/library/PFCP_Templates.ttcn +++ b/library/PFCP_Templates.ttcn @@ -11,7 +11,6 @@ module PFCP_Templates { import from General_Types all; -import from Native_Functions all; import from Osmocom_Types all; import from PFCP_Types all; @@ -209,14 +208,14 @@ return t; }; -template (value) F_SEID ts_PFCP_F_SEID_ipv4(charstring addr_v4, OCT8 seid) := { +template (value) F_SEID ts_PFCP_F_SEID_ipv4(OCT4 addr_v4, OCT8 seid) := { elementIdentifier := 57, lengthIndicator := 0, v6 := '0'B, v4 := '1'B, spare := '000000'B, seid := seid, - ipv4_address := f_inet_addr(addr_v4), + ipv4_address := addr_v4, ipv6_address := omit } @@ -235,18 +234,18 @@ spare := '0000'B } -template (value) UE_IP_Address ts_PFCP_UE_IP_Address_v4(charstring addr_v4, boolean is_destination := true) := { +template (value) UE_IP_Address ts_PFCP_UE_IP_Address_v4(OCT4 addr_v4, boolean is_destination := true) := { elementIdentifier := 93, lengthIndicator := 0, v6 := '0'B, v4 := '1'B, sd := bool2bit(is_destination), spare := '00000'B, - ipv4_address := f_inet_addr(addr_v4), + ipv4_address := addr_v4, ipv6_address := omit } -template (value) F_TEID ts_PFCP_F_TEID_ipv4(OCT4 teid, charstring addr_v4) := { +template (value) F_TEID ts_PFCP_F_TEID_ipv4(OCT4 teid, OCT4 addr_v4) := { elementIdentifier := 21, lengthIndicator := 0, v4 := '1'B, @@ -255,7 +254,7 @@ chid := '0'B, spare := '0000'B, teid := teid, - ipv4_address := f_inet_addr(addr_v4), + ipv4_address := addr_v4, ipv6_address := omit, choose_id := omit } @@ -325,13 +324,13 @@ spare := '0000'B } -template (value) Outer_Header_Creation ts_PFCP_Outer_Header_Creation_GTP_ipv4(OCT4 remote_teid, charstring remote_addr_v4) := { +template (value) Outer_Header_Creation ts_PFCP_Outer_Header_Creation_GTP_ipv4(OCT4 remote_teid, OCT4 remote_addr_v4) := { elementIdentifier := 84, lengthIndicator := 0, ohc_description_oct5 := '00000001'B, ohc_description_oct6 := '00000000'B, teid := remote_teid, - ipv4 := f_inet_addr(remote_addr_v4), + ipv4 := remote_addr_v4, ipv6 := omit, udp_port := omit } @@ -419,13 +418,16 @@ } } -function ts_PFCP_Session_Est_Req(charstring node_id, OCT8 cp_seid, Create_PDR_list create_pdr, Create_FAR_list create_far) +function ts_PFCP_Session_Est_Req(template (value) Node_ID node_id, + template (value) F_SEID cp_f_seid, + Create_PDR_list create_pdr, + Create_FAR_list create_far) return template (value) PDU_PFCP { var template (value) PDU_PFCP t := ts_PDU_PFCP(); t.message_body := { pfcp_session_establishment_request := { - node_id := ts_PFCP_Node_ID_ipv4(f_inet_addr(node_id)), - CP_F_SEID := ts_PFCP_F_SEID_ipv4(node_id, cp_seid), + node_id := node_id, + CP_F_SEID := cp_f_seid, create_PDR_list := create_pdr, create_FAR_list := create_far, create_URR_list := omit, diff --git a/upf/UPF_Tests.ttcn b/upf/UPF_Tests.ttcn index 796dc16..b5c65d2 100644 --- a/upf/UPF_Tests.ttcn +++ b/upf/UPF_Tests.ttcn @@ -539,7 +539,7 @@ private function f_ruleset_add_GTP_encaps(inout PFCP_Ruleset r, charstring ue_addr_v4 := "192.168.23.42", OCT4 remote_teid, - charstring gtp_dest_addr_v4) { + OCT4 gtp_dest_addr_v4) { var integer pdr_id := lengthof(r.pdr) + 1; var integer far_id := lengthof(r.far) + 1; @@ -550,7 +550,7 @@ pdr_id, ts_PFCP_PDI( CORE, - ue_addr_v4 := ts_PFCP_UE_IP_Address_v4(ue_addr_v4, is_destination := true) + ue_addr_v4 := ts_PFCP_UE_IP_Address_v4(f_inet_addr(ue_addr_v4), is_destination := true) ), far_id := far_id ) @@ -635,14 +635,16 @@ { var PFCP_Ruleset rules := { {}, {} }; f_ruleset_add_GTP_decaps(rules); - f_ruleset_add_GTP_encaps(rules, gtp.core_ip, gtp.teid_access_r, gtp.gtp_access_ip); + f_ruleset_add_GTP_encaps(rules, gtp.core_ip, gtp.teid_access_r, f_inet_addr(gtp.gtp_access_ip)); return rules; } /* Run a PFCP Session Establishment procedure */ private function f_session_est(inout PFCP_session s, PFCP_Ruleset rules) runs on CPF_ConnHdlr { - PFCP.send(ts_PFCP_Session_Est_Req(g_pars.local_addr, s.cp_seid, rules.pdr, rules.far)); + PFCP.send(ts_PFCP_Session_Est_Req(ts_PFCP_Node_ID_ipv4(f_inet_addr(g_pars.local_addr)), + ts_PFCP_F_SEID_ipv4(f_inet_addr(g_pars.local_addr), s.cp_seid), + rules.pdr, rules.far)); var PDU_PFCP pfcp; PFCP.receive(tr_PFCP_Session_Est_Resp(s.cp_seid)) -> value pfcp; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib068831787f4256f70a2189a5f36ca1ea1f40c9e Gerrit-Change-Number: 30926 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: upf: rename tc_session_est to tc_session_est_tunend

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30924 ) Change subject: upf: rename tc_session_est to tc_session_est_tunend ...................................................................... upf: rename tc_session_est to tc_session_est_tunend The other use case, tunmap, needs some space next to tunend, too. tunmap tests will be added soon. Related: SYS#6192 SYS#5599 Change-Id: If4a4534aa237e6ff1acb6d50e3738dd4dd6e9dfa --- M upf/UPF_Tests.ttcn 1 file changed, 11 insertions(+), 11 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/upf/UPF_Tests.ttcn b/upf/UPF_Tests.ttcn index 3dd469b..8382943 100644 --- a/upf/UPF_Tests.ttcn +++ b/upf/UPF_Tests.ttcn @@ -650,7 +650,7 @@ log("established PFCP session: ", s); } -private function f_create_PFCP_session() runs on CPF_ConnHdlr return PFCP_session +private function f_create_PFCP_session_tunend() runs on CPF_ConnHdlr return PFCP_session { var PFCP_session s := { up_seid := -, @@ -668,10 +668,10 @@ return s; } -/* Do a PFCP Session Establishment with default values (see f_create_PFCP_session()) */ -private function f_session_est_default() runs on CPF_ConnHdlr return PFCP_session +/* Do a PFCP Session Establishment with default values (see f_create_PFCP_session_tunend()) */ +private function f_session_est_tunend() runs on CPF_ConnHdlr return PFCP_session { - var PFCP_session s := f_create_PFCP_session(); + var PFCP_session s := f_create_PFCP_session_tunend(); f_session_est(s, f_ruleset_tunend(s.gtp)); return s; } @@ -711,9 +711,9 @@ } /* Verify PFCP Session Establishment and Deletion */ -private function f_tc_session_est(charstring id) runs on CPF_ConnHdlr { +private function f_tc_session_est_tunend(charstring id) runs on CPF_ConnHdlr { f_assoc_setup(); - var PFCP_session s := f_session_est_default(); + var PFCP_session s := f_session_est_tunend(); f_sleep(1.0); f_vty_expect_session_active(UPFVTY, s); f_session_del(s); @@ -722,11 +722,11 @@ f_assoc_release(); setverdict(pass); } -testcase TC_session_est() runs on test_CT { +testcase TC_session_est_tunend() runs on test_CT { var CPF_ConnHdlr vc_conn; f_init(guard_timeout := 15.0); - vc_conn := f_start_handler(refers(f_tc_session_est)); + vc_conn := f_start_handler(refers(f_tc_session_est_tunend)); vc_conn.done; f_shutdown_helper(); } @@ -734,7 +734,7 @@ /* Verify that releasing a PFCP Association also releases all its sessions and GTP actions. */ private function f_tc_session_term_by_assoc_rel(charstring id) runs on CPF_ConnHdlr { f_assoc_setup(); - var PFCP_session s := f_session_est_default(); + var PFCP_session s := f_session_est_tunend(); f_sleep(1.0); f_vty_expect_session_active(UPFVTY, s); f_assoc_release(); @@ -754,7 +754,7 @@ /* Verify that PFCP Sessions with a src-interface other than ACCESS or CORE are ACKed by osmo-upf but have no effect. */ private function f_tc_session_est_noop(charstring id) runs on CPF_ConnHdlr { f_assoc_setup(); - var PFCP_session s := f_create_PFCP_session(); + var PFCP_session s := f_create_PFCP_session_tunend(); f_session_est(s, f_ruleset_noop()); f_sleep(1.0); @@ -778,7 +778,7 @@ control { execute( TC_assoc_node_id_v4() ); execute( TC_assoc_node_id_fqdn() ); - execute( TC_session_est() ); + execute( TC_session_est_tunend() ); execute( TC_session_term_by_assoc_rel() ); execute( TC_session_est_noop() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30924 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If4a4534aa237e6ff1acb6d50e3738dd4dd6e9dfa Gerrit-Change-Number: 30924 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Introduce tun.{c,h}

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30994 ) Change subject: layer23: Introduce tun.{c,h} ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id8611b720ada17a3c602872fe095bb91eeb17bcd Gerrit-Change-Number: 30994 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Jan 2023 19:22:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Introduce tun.{c,h}

by pespin

Attention is currently required from: pespin. pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30994 ) Change subject: layer23: Introduce tun.{c,h} ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id8611b720ada17a3c602872fe095bb91eeb17bcd Gerrit-Change-Number: 30994 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: deleteVote

2 years, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log January 2023