February 2022 - gerrit-log - lists.osmocom.org

Change in pysim[master]: contrib/jenkins.sh: first upload manuals, then execute physical tests

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27122 ) Change subject: contrib/jenkins.sh: first upload manuals, then execute physical tests ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8aecb4ce211cbcc3890886ef24b04d01c510b6da Gerrit-Change-Number: 27122 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 09 Feb 2022 17:07:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in pysim[master]: contrib/jenkins.sh: Fix PUBLISH

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27123 ) Change subject: contrib/jenkins.sh: Fix PUBLISH ...................................................................... contrib/jenkins.sh: Fix PUBLISH There is no $base in this script, and the current form renders: make: *** /docs: No such file or directory. Stop. Build step 'Execute shell' marked build as failure Change-Id: Ifcf27f7497daeb285dfb364bff20d0c861c77dcb Related: OS#5271 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/23/27123/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 480f3e5..0fd2473 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -48,7 +48,7 @@ (cd docs && make html latexpdf) if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then - make -C "$base/docs" publish + make -C "docs" publish fi # run the test with physical cards -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ifcf27f7497daeb285dfb364bff20d0c861c77dcb Gerrit-Change-Number: 27123 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in pysim[master]: contrib/jenkins.sh: first upload manuals, then execute physical tests

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27122 ) Change subject: contrib/jenkins.sh: first upload manuals, then execute physical tests ...................................................................... contrib/jenkins.sh: first upload manuals, then execute physical tests The tests with physical cards should not prevent upload of the manuals Change-Id: I8aecb4ce211cbcc3890886ef24b04d01c510b6da --- M contrib/jenkins.sh 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/22/27122/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index a01c012..480f3e5 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -47,10 +47,10 @@ pip3 install -e 'git+https://github.com/osmocom/sphinx-argparse@master#egg=sphinx-argparse' (cd docs && make html latexpdf) -# run the test with physical cards -cd pysim-testdata -../tests/pysim-test.sh - if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then make -C "$base/docs" publish fi + +# run the test with physical cards +cd pysim-testdata +../tests/pysim-test.sh -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8aecb4ce211cbcc3890886ef24b04d01c510b6da Gerrit-Change-Number: 27122 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in osmo-ci[master]: jobs/master-builds.yml: Add master-pysim to publish manual

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27121 ) Change subject: jobs/master-builds.yml: Add master-pysim to publish manual ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ci/+/27121/comment/5b376f43_69815106 PS1, Line 16: Closes: OS#5271 I believe this change is related to my old ticket too: https://osmocom.org/issues/4384 "Jenkins program-read verification on daily (or weekly) basis". -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4dce05cdb5f2c574256378d5fb66cff1c329c141 Gerrit-Change-Number: 27121 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 09 Feb 2022 16:54:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-ci[master]: jobs/master-builds.yml: Add master-pysim to publish manual

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/27121 ) Change subject: jobs/master-builds.yml: Add master-pysim to publish manual ...................................................................... jobs/master-builds.yml: Add master-pysim to publish manual We only had gerrit build verification for pysim so far, but no 'master' job that periodically builds/tests master (and publishes the manual). As a reult, the pySim manual was still the original version from April 2021, while the code has of course progressed quite a bit in git since. Change-Id: I4dce05cdb5f2c574256378d5fb66cff1c329c141 Closes: OS#5271 --- M jobs/master-builds.yml 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/21/27121/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 0b226d1..95efdd6 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -371,6 +371,11 @@ - rtl-sdr: email: laforge(a)gnumonks.org steve(a)steve-m.de + - pysim: + concurrent: false + slave_axis: !!python/tuple [simtester] + cmd: 'PUBLISH=1 WITH_MANUALS=1 /usr/bin/timeout 30m ./contrib/jenkins.sh' + - sysmo-usim-tool: concurrent: false cmd: cd ./tests; ./run-tests -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4dce05cdb5f2c574256378d5fb66cff1c329c141 Gerrit-Change-Number: 27121 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27103 ) Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... Patch Set 3: (2 comments) File jenkins-common.sh: https://gerrit.osmocom.org/c/docker-playground/+/27103/comment/eafa5d08_25a… PS1, Line 422: osmo-ttcn3-hacks > Do we have such a testsuite? Maybe rather use 'ttcn3-bts-test' as an example? right, that's what I wanted to put there :) https://gerrit.osmocom.org/c/docker-playground/+/27103/comment/635109f1_692… PS1, Line 422: name > 'image' I guess? Done -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If2d1ba8a775dc6c396f50f9853e633df110329a9 Gerrit-Change-Number: 27103 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 09 Feb 2022 16:39:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files

by osmith

Attention is currently required from: osmith. Hello fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/27103 to look at the new patch set (#3). Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... ttcn3-bts-test: use osmo-config-merge to generate config files This uses the config files from osmo-ttcn3-hacks.git instead of keeping local copies around here, which has shown many times will get out of sync. Copy the files from the git repository checked out in the ttcn3-bts-test docker image, so we don't need to take care of cloning the repository again and checking out the same commit as used inside that image. Original files are copied to *.src.cfg, and then merged with the local *.confmerge files using osmo-conf-merge (*.gen.cfg). Unfortunately, osmo-config-merge is not capable of removing text blocks or substituting specific parts, so we fall-back to using sed where it's needed. A good example is 'log gsmtap 127.0.0.1', as there is no command for removing a logging target of such type. Co-Authored-By: Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> Co-Authored-By: Oliver Smith <osmith(a)sysmocom.de> Change-Id: If2d1ba8a775dc6c396f50f9853e633df110329a9 --- M .gitignore M jenkins-common.sh D ttcn3-bts-test/fh/osmo-bsc.cfg A ttcn3-bts-test/fh/osmo-bsc.confmerge M ttcn3-bts-test/jenkins.sh D ttcn3-bts-test/oml/osmo-bts.cfg A ttcn3-bts-test/oml/osmo-bts.confmerge D ttcn3-bts-test/osmo-bsc.cfg A ttcn3-bts-test/osmo-bsc.confmerge D ttcn3-bts-test/osmo-bts.cfg A ttcn3-bts-test/osmo-bts.confmerge D ttcn3-bts-test/virtphy/osmo-bts.cfg A ttcn3-bts-test/virtphy/osmo-bts.confmerge 13 files changed, 336 insertions(+), 851 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/03/27103/3 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If2d1ba8a775dc6c396f50f9853e633df110329a9 Gerrit-Change-Number: 27103 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: hnbgw: Test RAB Assignment ReleaseRequest

by daniel

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27120 ) Change subject: hnbgw: Test RAB Assignment ReleaseRequest ...................................................................... hnbgw: Test RAB Assignment ReleaseRequest Change-Id: I90d4b1d335a32ab6e2590616149f3a34825d2046 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 58 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/20/27120/1 diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index e3aa293..3c88c6b 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -881,6 +881,63 @@ vc_conn.done; } +friend function f_tc_rab_release(charstring id, TestHdlrParams pars) runs on ConnHdlr { + var MgcpCommand mgcp_cmd; + var RANAP_PDU tx; + timer T := 15.0; + + f_init_handler(pars); + f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); + + tx := f_build_initial_ue(g_pars); + f_iuh2iu_connect(tx); + + f_create_rab(pars.mgcp_pars); + + /* Send RAB Release */ + tx := valueof(ts_RANAP_RabReleaseReq(ts_RAB_RL(t_RAB_id(23), ts_RanapCause_om_intervention))); + BSSAP.send(tx); + + T.start; + var integer count := 0; + + alt { + [count == 0] MGCP.receive(tr_DLCX(pars.mgcp_pars.mgcp_ep)) -> value mgcp_cmd { + log("DLCX1", mgcp_cmd); + MGCP.send(ts_DLCX_ACK2(mgcp_cmd.line.trans_id)); + count := 1; + repeat; + } + [count == 1] MGCP.receive(tr_DLCX(pars.mgcp_pars.mgcp_ep)) -> value mgcp_cmd { + log("DLCX2", mgcp_cmd); + MGCP.send(ts_DLCX_ACK2(mgcp_cmd.line.trans_id)); + setverdict(pass); + } + [] T.timeout { + setverdict(fail, "Timeout waiting for DLCX"); + } + } + + alt { + [] RUA.receive(tx) { + setverdict(pass); + } + [] T.timeout { + setverdict(fail, "Timeout waiting for Iuh ", tx); + } + } + +} + +testcase TC_rab_release() runs on test_CT { + var ConnHdlr vc_conn; + f_init(); + f_start_hnbs(); + + vc_conn := f_start_handler_with_pars(refers(f_tc_rab_release), t_pars(5)); + vc_conn.done; +} + /* Create an Iuh connection; send InitialUE; transceive data both directions */ friend function f_tc_ranap_bidir(charstring id, TestHdlrParams pars) runs on ConnHdlr { f_init_handler(pars); @@ -959,6 +1016,7 @@ execute(TC_ranap_cs_bidir()); execute(TC_ranap_ps_bidir()); execute(TC_rab_assignment()); + execute(TC_rab_release()); execute(TC_ranap_cs_mo_disconnect()); execute(TC_ranap_ps_mo_disconnect()); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27120 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: I90d4b1d335a32ab6e2590616149f3a34825d2046 Gerrit-Change-Number: 27120 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ranap: Add templates for RAB Assignment ReleaseRequest

by daniel

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27119 ) Change subject: ranap: Add templates for RAB Assignment ReleaseRequest ...................................................................... ranap: Add templates for RAB Assignment ReleaseRequest Change-Id: Ie22253c84651119c4da91053eb4d79ad8f4abe7d --- M library/ranap/RANAP_Templates.ttcn 1 file changed, 76 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/19/27119/1 diff --git a/library/ranap/RANAP_Templates.ttcn b/library/ranap/RANAP_Templates.ttcn index db4145f..7316d49 100644 --- a/library/ranap/RANAP_Templates.ttcn +++ b/library/ranap/RANAP_Templates.ttcn @@ -1430,6 +1430,82 @@ } } +template (value) RAB_ReleaseList ts_RAB_RL(template (value) RAB_ID rab_id, + template (value) Cause cause) := { { + { + id := id_RAB_ReleaseItem, + criticality := ignore, + value_ := { + rAB_ReleaseItem := { + rAB_ID := rab_id, + cause := cause, + iE_Extensions := omit + } + } + } +} } + +template RAB_ReleaseList tr_RAB_RL(template RAB_ID rab_id, + template Cause cause := ?) := { { + { + id := id_RAB_ReleaseItem, + criticality := ignore, + value_ := { + rAB_ReleaseItem := { + rAB_ID := rab_id, + cause := cause, + iE_Extensions := * + } + } + } +} } + +template (value) RANAP_PDU +ts_RANAP_RabReleaseReq(template (value) RAB_ReleaseList rab_rl, + template (omit) RAB_ReleaseRequest.protocolExtensions exts := omit) := { + initiatingMessage := { + procedureCode := id_RAB_Assignment, + criticality := reject, + value_ := { + rAB_ReleaseRequest := { + protocolIEs := { + { + id := id_RAB_ReleaseList, + criticality := ignore, + value_ := { + rAB_ReleaseList := rab_rl + } + } + }, + protocolExtensions := exts + } + } + } +} + +template RANAP_PDU +tr_RANAP_RabReleaseReq(template RAB_ReleaseList rab_rl, + template RAB_ReleaseRequest.protocolExtensions exts := *) := { + initiatingMessage := { + procedureCode := id_RAB_Assignment, + criticality := reject, + value_ := { + rAB_ReleaseRequest := { + protocolIEs := { + { + id := id_RAB_ReleaseList, + criticality := ignore, + value_ := { + rAB_ReleaseList := rab_rl + } + } + }, + protocolExtensions := exts + } + } + } +} + /***************************************************************************************************** * -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27119 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: Ie22253c84651119c4da91053eb4d79ad8f4abe7d Gerrit-Change-Number: 27119 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: hnbgw: Use helper function for the rab assignment

by daniel

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27116 ) Change subject: hnbgw: Use helper function for the rab assignment ...................................................................... hnbgw: Use helper function for the rab assignment Change-Id: I95625796ee3c75e36637794018e5db27d022dddb --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 36 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/16/27116/1 diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 8a3c885..7de0959 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -125,6 +125,10 @@ CrcxResponse mgw_conn_2, uint7_t rtp_payload_type, charstring rtp_sdp_format, + HostName hnb_rtp_ip, + PortNumber hnb_rtp_port, + HostName cn_rtp_ip, + PortNumber cn_rtp_port, boolean use_osmux, integer got_osmux_count } @@ -142,21 +146,26 @@ mgw_conn_2 := { resp := 1, mgw_rtp_ip := "2.2.2.2", - mgw_rtp_port := 11000, + mgw_rtp_port := 20000, mgcp_connection_id := '22222'H }, rtp_payload_type := 23, rtp_sdp_format := "FOO", + hnb_rtp_ip := "1.1.1.2", + hnb_rtp_port := 10001, + cn_rtp_ip := "2.2.2.1", + cn_rtp_port := 20001, use_osmux := false, got_osmux_count := 0 } + type record TestHdlrParams { integer hnb_idx, hexstring imsi, boolean ps_domain, MgcpParameters mgcp_pars optional, HnbConfig hnb optional -}; +} /* We extend: * RUA_ConnHdlr (for the Iuh side, emulating the HNB) @@ -745,21 +754,15 @@ return mgcp_resp; } -friend function f_tc_rab_assignment(charstring id, TestHdlrParams pars) runs on ConnHdlr { +friend function f_create_rab(MgcpParameters pars) runs on ConnHdlr { var MgcpCommand mgcp_cmd; var RANAP_PDU tx; var template RAB_SetupOrModifyList rab_sml; var template RAB_SetupOrModifiedList rab_smdl; timer T := 5.0; - f_init_handler(pars); - f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); - - tx := f_build_initial_ue(g_pars); - f_iuh2iu_connect(tx); - /* Send RAB Assignment Request */ - rab_sml := ts_RAB_SML(t_RAB_id(23), f_ts_RAB_TLA("192.168.0.1"), t_RAB_binding_port(1234)); + rab_sml := ts_RAB_SML(t_RAB_id(23), f_ts_RAB_TLA(pars.cn_rtp_ip), t_RAB_binding_port(pars.cn_rtp_port)); tx := valueof(ts_RANAP_RabAssReq(rab_sml)); BSSAP.send(tx); T.start; @@ -768,7 +771,7 @@ alt { [] MGCP.receive(tr_CRCX) -> value mgcp_cmd { log("CRCX1", mgcp_cmd); - var template MgcpResponse mgcp_rsp := f_handle_crcx(pars.mgcp_pars, mgcp_cmd); + var template MgcpResponse mgcp_rsp := f_handle_crcx(pars, mgcp_cmd); MGCP.send(valueof(mgcp_rsp)); } [] T.timeout { @@ -777,7 +780,7 @@ } /* Expect RAB Assignment Request with IP/port from CRCX ACK via Iuh */ - rab_sml := ts_RAB_SML(t_RAB_id(23), f_ts_RAB_TLA(pars.mgcp_pars.mgw_conn_1.mgw_rtp_ip), t_RAB_binding_port(pars.mgcp_pars.mgw_conn_1.mgw_rtp_port)); + rab_sml := ts_RAB_SML(t_RAB_id(23), f_ts_RAB_TLA(pars.mgw_conn_1.mgw_rtp_ip), t_RAB_binding_port(pars.mgw_conn_1.mgw_rtp_port)); tx := valueof(ts_RANAP_RabAssReq(rab_sml)); alt { @@ -790,7 +793,7 @@ } /* Send back RAB Assignment Response via Iuh */ - rab_smdl := ts_RAB_SMdL(t_RAB_id(23), f_ts_RAB_TLA("192.168.0.2"), t_RAB_binding_port(1235)); + rab_smdl := ts_RAB_SMdL(t_RAB_id(23), f_ts_RAB_TLA(pars.hnb_rtp_ip), t_RAB_binding_port(pars.hnb_rtp_port)); tx := valueof(ts_RANAP_RabAssResp(rab_smdl)); RUA.send(tx); T.start; @@ -800,34 +803,46 @@ [] MGCP.receive(tr_MDCX) -> value mgcp_cmd { log("MDCX1", mgcp_cmd); /* Verify SDP of MDCX */ - var SDP_Message sdp := valueof(ts_SDP(pars.mgcp_pars.mgw_conn_1.mgw_rtp_ip, pars.mgcp_pars.mgw_conn_1.mgw_rtp_ip, hex2str(pars.mgcp_pars.mgcp_call_id), "42", pars.mgcp_pars.mgw_conn_1.mgw_rtp_port, - { int2str(pars.mgcp_pars.rtp_payload_type) }, { valueof(ts_SDP_rtpmap(pars.mgcp_pars.rtp_payload_type, pars.mgcp_pars.rtp_sdp_format)), valueof(ts_SDP_ptime(20)) } )); - var template MgcpResponse mgcp_rsp := ts_MDCX_ACK(mgcp_cmd.line.trans_id, pars.mgcp_pars.mgw_conn_1.mgcp_connection_id, sdp); + var SDP_Message sdp := valueof(ts_SDP(pars.mgw_conn_1.mgw_rtp_ip, pars.mgw_conn_1.mgw_rtp_ip, hex2str(pars.mgcp_call_id), "42", pars.mgw_conn_1.mgw_rtp_port, + { int2str(pars.rtp_payload_type) }, { valueof(ts_SDP_rtpmap(pars.rtp_payload_type, pars.rtp_sdp_format)), valueof(ts_SDP_ptime(20)) } )); + var template MgcpResponse mgcp_rsp := ts_MDCX_ACK(mgcp_cmd.line.trans_id, pars.mgw_conn_1.mgcp_connection_id, sdp); MGCP.send(valueof(mgcp_rsp)); } /* Handle CRCX for second leg of endpoint, answer with IP/port */ - [] MGCP.receive(tr_CRCX(pars.mgcp_pars.mgcp_ep)) -> value mgcp_cmd { + [] MGCP.receive(tr_CRCX(pars.mgcp_ep)) -> value mgcp_cmd { log("CRCX2", mgcp_cmd); /* Verify SDP of CRCX */ - var template MgcpResponse mgcp_rsp := f_handle_crcx(pars.mgcp_pars, mgcp_cmd); + var template MgcpResponse mgcp_rsp := f_handle_crcx(pars, mgcp_cmd); MGCP.send(valueof(mgcp_rsp)); } } /* Expect RAB Assignment Response with IP/port from second CRCX ACK */ - rab_smdl := ts_RAB_SMdL(t_RAB_id(23), f_ts_RAB_TLA(pars.mgcp_pars.mgw_conn_2.mgw_rtp_ip), t_RAB_binding_port(pars.mgcp_pars.mgw_conn_2.mgw_rtp_port)); + rab_smdl := ts_RAB_SMdL(t_RAB_id(23), f_ts_RAB_TLA(pars.mgw_conn_2.mgw_rtp_ip), t_RAB_binding_port(pars.mgw_conn_2.mgw_rtp_port)); tx := valueof(ts_RANAP_RabAssResp(rab_smdl)); - log("Resp:", tx); alt { [] BSSAP.receive(tx) { - log("Got RAB Resp") setverdict(pass); } [] T.timeout { setverdict(fail, "Timeout waiting for Iuh ", tx); } } +} + +friend function f_tc_rab_assignment(charstring id, TestHdlrParams pars) runs on ConnHdlr { + var MgcpCommand mgcp_cmd; + var RANAP_PDU tx; + timer T := 5.0; + + f_init_handler(pars); + f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); + + tx := f_build_initial_ue(g_pars); + f_iuh2iu_connect(tx); + + f_create_rab(pars.mgcp_pars); /* Send Iu Release */ tx := valueof(ts_RANAP_IuReleaseCommand(ts_RanapCause_om_intervention)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27116 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: I95625796ee3c75e36637794018e5db27d022dddb Gerrit-Change-Number: 27116 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2022