March 2024 - gerrit-log - lists.osmocom.org

[XL] Change in osmo-ttcn3-hacks[master]: MGCP_Templates: Avoid extra indenation for most of the whole file

by fixeria

Attention is currently required from: jolly, osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36379?usp=email ) Change subject: MGCP_Templates: Avoid extra indenation for most of the whole file ...................................................................... Patch Set 1: (1 comment) File library/MGCP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36379/comment/40a026dd_43e1… PS1, Line 241: template MgcpConnectionId conn_id := omit) return template MgcpCommand { please fix alignment here and below (it was aligned before your patch) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36379?usp=email 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: I9338c73db94a1ed3e2945bc40a46573c4a674ba3 Gerrit-Change-Number: 36379 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 06:01:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in osmo-ci[master]: gerrit-verifications: execute 'distcheck' job for pysim

by fixeria

Attention is currently required from: laforge, osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36384?usp=email ) Change subject: gerrit-verifications: execute 'distcheck' job for pysim ...................................................................... Patch Set 1: (1 comment) File jobs/gerrit-verifications.yml: https://gerrit.osmocom.org/c/osmo-ci/+/36384/comment/71b60a56_be6f7abf PS1, Line 405: simtester FYI: it's intentionally `simtester` machine here, so that we can benefit from having all dependency packages already fetched. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36384?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9d4d9e9de2b16a4b745791f3c9c93507f43bfa6d Gerrit-Change-Number: 36384 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: char <osmocom(a)hypodyne.net> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 22 Mar 2024 05:58:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in pysim[master]: add missing modules to setup.py

by char

Attention is currently required from: fixeria. char has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/36376?usp=email ) Change subject: add missing modules to setup.py ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > > Calling each binary with --help during build and checking if it crashes is a fairly simple "smoke […] Very cool! -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36376?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I330d5e35e5f1b508c6209b6894009b5fdd35d660 Gerrit-Change-Number: 36376 Gerrit-PatchSet: 2 Gerrit-Owner: char <osmocom(a)hypodyne.net> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Mar 2024 18:37:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: char <osmocom(a)hypodyne.net> Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in osmo-ci[master]: gerrit-verifications: execute 'distcheck' job for pysim

by char

Attention is currently required from: fixeria. char has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36384?usp=email ) Change subject: gerrit-verifications: execute 'distcheck' job for pysim ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Looks good to me! -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36384?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9d4d9e9de2b16a4b745791f3c9c93507f43bfa6d Gerrit-Change-Number: 36384 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: char <osmocom(a)hypodyne.net> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Mar 2024 18:36:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in pysim[master]: contrib/jenkins.sh: add 'distcheck' job to check package integrity

by char

Attention is currently required from: fixeria. char has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/36383?usp=email ) Change subject: contrib/jenkins.sh: add 'distcheck' job to check package integrity ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Looks good to me! -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36383?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic72d58494e8fd0cab8d66ce60f7b70593b770872 Gerrit-Change-Number: 36383 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: char <osmocom(a)hypodyne.net> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Mar 2024 18:36:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in pysim[master]: add missing modules to setup.py

by fixeria

Attention is currently required from: char. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/36376?usp=email ) Change subject: add missing modules to setup.py ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > Calling each binary with --help during build and checking if it crashes is a fairly simple "smoke test" I've seen done before. That would have caught the issue fixed by this patch, at least. Sounds like a good idea to me! I was about to mention some important details on how to implement this correctly (e.g. that we actually need to install pySim as a package) in `contrib/jenkins.sh`, but ended up writing a patch myself while exploring possible options ;) https://gerrit.osmocom.org/c/pysim/+/36383 contrib/jenkins.sh: add 'distcheck' job to check package integrity https://gerrit.osmocom.org/c/osmo-ci/+/36384 gerrit-verifications: execute 'distcheck' job for pysim -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36376?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I330d5e35e5f1b508c6209b6894009b5fdd35d660 Gerrit-Change-Number: 36376 Gerrit-PatchSet: 2 Gerrit-Owner: char <osmocom(a)hypodyne.net> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: char <osmocom(a)hypodyne.net> Gerrit-Comment-Date: Thu, 21 Mar 2024 18:23:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: char <osmocom(a)hypodyne.net> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in osmo-ci[master]: gerrit-verifications: execute 'distcheck' job for pysim

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/36384?usp=email ) Change subject: gerrit-verifications: execute 'distcheck' job for pysim ...................................................................... gerrit-verifications: execute 'distcheck' job for pysim Change-Id: I9d4d9e9de2b16a4b745791f3c9c93507f43bfa6d Related: pysim.git Ic72d58494e8fd0cab8d66ce60f7b70593b770872 --- M jobs/gerrit-verifications.yml 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/84/36384/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 492c06e..f1036c9 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -399,9 +399,10 @@ concurrent: false slave_axis: !!python/tuple [simtester,osmocom-gerrit] a2_name: JOB_TYPE - a2: !!python/tuple ["test", "pylint", "docs"] + a2: !!python/tuple ["test", "distcheck", "pylint", "docs"] combination_filter: > (JOB_TYPE == "test" && label == "simtester") || + (JOB_TYPE == "distcheck" && label == "simtester") || (JOB_TYPE == "pylint" && label == "osmocom-gerrit") || (JOB_TYPE == "docs" && label == "osmocom-gerrit") cmd: | -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36384?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9d4d9e9de2b16a4b745791f3c9c93507f43bfa6d Gerrit-Change-Number: 36384 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

[S] Change in pysim[master]: contrib/jenkins.sh: add 'distcheck' job to check package integrity

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/36383?usp=email ) Change subject: contrib/jenkins.sh: add 'distcheck' job to check package integrity ...................................................................... contrib/jenkins.sh: add 'distcheck' job to check package integrity The idea of this new job is to catch package integrity problems, like the missing entries in setup.py/packages[] or missing deps. Change-Id: Ic72d58494e8fd0cab8d66ce60f7b70593b770872 Related: osmo-ci.git I9d4d9e9de2b16a4b745791f3c9c93507f43bfa6d --- M contrib/jenkins.sh 1 file changed, 25 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/83/36383/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index a5993da..6fb3d1a 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -4,7 +4,7 @@ # environment variables: # * WITH_MANUALS: build manual PDFs if set to "1" # * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1") -# * JOB_TYPE: one of 'test', 'pylint', 'docs' +# * JOB_TYPE: one of 'test', 'distcheck', 'pylint', 'docs' # export PYTHONUNBUFFERED=1 @@ -32,6 +32,17 @@ ../tests/pySim-prog_test.sh ../tests/pySim-trace_test.sh ;; +"distcheck") + virtualenv -p python3 venv --system-site-packages + . venv/bin/activate + + pip install . + pip install pyshark + + for prog in venv/bin/pySim-*.py; do + $prog --help > /dev/null + done + ;; "pylint") # Print pylint version pip3 freeze | grep pylint -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36383?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic72d58494e8fd0cab8d66ce60f7b70593b770872 Gerrit-Change-Number: 36383 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

[S] Change in pysim[master]: add missing modules to setup.py

by char

Attention is currently required from: fixeria. char has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/36376?usp=email ) Change subject: add missing modules to setup.py ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > Thanks, the fix looks good. […] Calling each binary with `--help` during build and checking if it crashes is a fairly simple "smoke test" I've seen done before. That would have caught the issue fixed by this patch, at least. If you'd like me to do that, I'll add it in a separate patch set. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36376?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I330d5e35e5f1b508c6209b6894009b5fdd35d660 Gerrit-Change-Number: 36376 Gerrit-PatchSet: 2 Gerrit-Owner: char <osmocom(a)hypodyne.net> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Mar 2024 17:41:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: char <osmocom(a)hypodyne.net> Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sip: Get Rid of private copy of f_mgcp_addr2addrtype()

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36382?usp=email ) Change subject: sip: Get Rid of private copy of f_mgcp_addr2addrtype() ...................................................................... sip: Get Rid of private copy of f_mgcp_addr2addrtype() The function was copied from MGCP_Templates.ttcn since the logic is the same for SDP, but copied in order to avoid depending on whole MGCP file. Since now SDP logic has been moved to its own SDP_Templates and a new f_sdp_addr2addrtype() was added, use that one. Change-Id: I27ce46b6d23ba0f2704dd0cee290ed519dec278e --- M sip/SIP_Tests.ttcn M sip/gen_links.sh 2 files changed, 23 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/82/36382/1 diff --git a/sip/SIP_Tests.ttcn b/sip/SIP_Tests.ttcn index 9f8f8f8..9d92b87 100644 --- a/sip/SIP_Tests.ttcn +++ b/sip/SIP_Tests.ttcn @@ -26,6 +26,7 @@ import from MNCC_Types all; import from SDP_Types all; +import from SDP_Templates all; import from SIP_Emulation all; import from SIPmsg_Types all; @@ -110,14 +111,6 @@ cp.comp.sip_body := ""; } -private function f_mgcp_addr2addrtype(charstring addr) return charstring { - for (var integer i := 0; i < lengthof(addr); i := i + 1) { - if (addr[i] == ":") { - return "IP6"; - } - } - return "IP4"; -} function f_init_mncc(charstring id) runs on test_CT { id := id & "-MNCC"; var MnccOps ops := { @@ -304,7 +297,7 @@ /* MSC -> OSC: SDP that the MSC will send via MNCC */ var charstring cn_sdp := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & - f_mgcp_addr2addrtype(cp.cn_rtp_addr) & " " & cp.cn_rtp_addr & + f_sdp_addr2addrtype(cp.cn_rtp_addr) & " " & cp.cn_rtp_addr & "\r\nt=0 0\r\nm=audio " & int2str(cp.cn_rtp_port) & " RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; /* OSC -> SIP: what SDP to expect in SIP from osmo-sip-connector */ @@ -396,7 +389,7 @@ */ var charstring cn_sdp := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & - f_mgcp_addr2addrtype(cp.cn_rtp_addr) & " " & cp.cn_rtp_addr & + f_sdp_addr2addrtype(cp.cn_rtp_addr) & " " & cp.cn_rtp_addr & "\r\nt=0 0\r\nm=audio " & int2str(cp.cn_rtp_port) & " RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; @@ -518,7 +511,7 @@ var CallPars cp := g_pars.g_cp; f_CallPars_compute(cp); cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & - f_mgcp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & + f_sdp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & "\r\nt=0 0\r\nm=audio " & int2str(cp.sip_rtp_port) & " RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; f_sleep(3.0) @@ -555,7 +548,7 @@ var CallPars cp := g_pars.g_cp; f_CallPars_compute(cp); cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & - f_mgcp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & + f_sdp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & "\r\nt=0 0\r\nm=audio " & int2str(cp.sip_rtp_port) & " RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; f_sleep(3.0) @@ -582,7 +575,7 @@ var CallPars cp := g_pars.g_cp; f_CallPars_compute(cp); cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & - f_mgcp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & + f_sdp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & "\r\nt=0 0\r\nm=audio " & int2str(cp.sip_rtp_port) & " RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; f_sleep(3.0) @@ -619,7 +612,7 @@ var CallPars cp := g_pars.g_cp; f_CallPars_compute(cp); cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & - f_mgcp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & + f_sdp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & "\r\nt=0 0\r\nm=audio " & int2str(cp.sip_rtp_port) & " RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; f_sleep(3.0) @@ -645,7 +638,7 @@ var CallPars cp := g_pars.g_cp; f_CallPars_compute(cp); cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & - f_mgcp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & + f_sdp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & "\r\nt=0 0\r\nm=audio " & int2str(cp.sip_rtp_port) & " RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; f_sleep(3.0); diff --git a/sip/gen_links.sh b/sip/gen_links.sh index cf09731..81c1578 100755 --- a/sip/gen_links.sh +++ b/sip/gen_links.sh @@ -43,6 +43,7 @@ FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " FILES+="RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunctDef.cc " +FILES+="SDP_Templates.ttcn " FILES+="SIP_Emulation.ttcn SIP_Templates.ttcn " gen_links $DIR $FILES -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36382?usp=email 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: I27ce46b6d23ba0f2704dd0cee290ed519dec278e Gerrit-Change-Number: 36382 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2024