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

[M] Change in ...osmo_dia2gsup[master]: contrib/systemd: run as osmocom user

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/36771?usp=email ) Change subject: contrib/systemd: run as osmocom user ...................................................................... contrib/systemd: run as osmocom user Run the systemd service as osmocom user and group instead of root. Set the StateDirectory and WorkingDirectory like we have it in other Osmocom service files. Remove the ExecStartPre mkdir, as the directory now gets created by postinst. Related: OS#4107 Change-Id: I2c0c7f4b98300b3b0bb5b95013b51b6b60625b95 --- M contrib/systemd/osmo_dia2gsup.service A debian/postinst 2 files changed, 49 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_dia2gsup refs/changes/71/36771/1 diff --git a/contrib/systemd/osmo_dia2gsup.service b/contrib/systemd/osmo_dia2gsup.service index 2ef737c..e3d092e 100644 --- a/contrib/systemd/osmo_dia2gsup.service +++ b/contrib/systemd/osmo_dia2gsup.service @@ -7,8 +7,11 @@ [Service] Type=simple Restart=always +StateDirectory=osmo_dia2gsup +WorkingDirectory=%S/osmo_dia2gsup +User=osmocom +Group=osmocom Environment="HOME=/var/lib/osmo_dia2gsup" -ExecStartPre=/usr/bin/mkdir -p /var/lib/osmo_dia2gsup ExecStart=/usr/bin/osmo-dia2gsup foreground RestartSec=2 diff --git a/debian/postinst b/debian/postinst new file mode 100644 index 0000000..f9f64c8 --- /dev/null +++ b/debian/postinst @@ -0,0 +1,30 @@ +#!/bin/sh -e +case "$1" in + configure) + # Create the osmocom group and user (if it doesn't exist yet) + if ! getent group osmocom >/dev/null; then + groupadd --system osmocom + fi + if ! getent passwd osmocom >/dev/null; then + useradd \ + --system \ + --gid osmocom \ + --home-dir /var/lib/osmocom \ + --shell /sbin/nologin \ + --comment "Open Source Mobile Communications" \ + osmocom + fi + + # Fix permissions of previous (root-owned) install (OS#4107) + chown osmocom:osmocom /etc/osmocom/osmo_dia2gsup.service + chmod 0660 /etc/osmocom/osmo_dia2gsup.service + chown root:osmocom /etc/osmocom + chmod 2775 /etc/osmocom + mkdir -p /var/lib/osmo_dia2gsup + chown -R osmocom:osmocom /var/lib/osmo_dia2gsup + ;; +esac + +# dh_installdeb(1) will replace this with shell code automatically +# generated by other debhelper scripts. +#DEBHELPER# -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/36771?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I2c0c7f4b98300b3b0bb5b95013b51b6b60625b95 Gerrit-Change-Number: 36771 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Implement AMI_Adapter using IPL4 instead of TELNET

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755?usp=email ) Change subject: asterisk: Implement AMI_Adapter using IPL4 instead of TELNET ...................................................................... Patch Set 3: (2 comments) File asterisk/AMI_Functions.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755/comment/6e3011c2_87f0… PS3, Line 260: /* TEXT Enc/dec is not happy with values containing "; ", get rid of them: : * "AppData: 5,0502: Call pjsip endpoint from 0501\r\n" */ : var integer pos := f_strstr(patched_txt, "AppData: ", 0); : if (pos >= 0) { : var integer pos_end := f_strstr(patched_txt, "\r\n", pos) + lengthof("\r\n"); : var charstring to_remove := substr(patched_txt, pos, pos_end - pos); : patched_txt := f_str_replace(patched_txt, to_remove, ""); : } > It's removing the full line "AppData: 5,0502: Call pjsip endpoint from 0501\r\n", since we don't nee […] ah thanks for explaining! could you update the comment, mention ": " and that it just removes the whole line? that would make it much clearer https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755/comment/fec411c2_0fd1… PS3, Line 480: log("AMI_Msg decoded: ", msg); > That's more like a playground to test stuff interactively (recompile, test, etc. […] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755?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: Icaf2860c1dd4befa4498f0d176cfadf26cfa8d1d Gerrit-Change-Number: 36755 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 May 2024 12:58:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: Misc_Helpers.ttcn: Add some more string handling API helpers

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36754?usp=email ) Change subject: Misc_Helpers.ttcn: Add some more string handling API helpers ...................................................................... Misc_Helpers.ttcn: Add some more string handling API helpers These are currently used by code in AMI_Functions doing some workaround for TEXT decoder limitations. They can be merged independently now since anyway they are totally generic and may be useful for future users. Change-Id: I3d6da125a10807b7a2f3ecad8145a046a322c7d6 --- M library/Misc_Helpers.ttcn 1 file changed, 40 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/library/Misc_Helpers.ttcn b/library/Misc_Helpers.ttcn index 805254a..a742b0b 100644 --- a/library/Misc_Helpers.ttcn +++ b/library/Misc_Helpers.ttcn @@ -79,6 +79,31 @@ return count; } +/* Return true if str ends exactly with token: */ +function f_str_endswith(charstring str, charstring token) return boolean +{ + if (lengthof(str) < lengthof(token)) { + return false; + } + var charstring str_end := substr(str, lengthof(str) - lengthof(token), lengthof(token)); + return str_end == token; +} + +/* Replace all matches of token "find" with "repl" in "str" */ +function f_str_replace(charstring str, charstring find, charstring repl) return charstring +{ + var integer pos := f_strstr(str, find, 0); + if (pos < 0) { + return str; + } + var charstring prefix := substr(str, 0, pos); + var integer suffix_pos := pos + lengthof(find); + var charstring suffix := substr(str, suffix_pos, lengthof(str) - suffix_pos); + + var charstring new_str := prefix & repl & f_str_replace(suffix, find, repl); + return new_str; +} + type record of charstring ro_charstring; function f_str_split(charstring str, charstring delim := "\n") return ro_charstring { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36754?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: I3d6da125a10807b7a2f3ecad8145a046a322c7d6 Gerrit-Change-Number: 36754 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(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-MessageType: merged

1 year, 1 month

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Introduce AMI_Adapter_CT

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36711?usp=email ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: asterisk: Introduce AMI_Adapter_CT ...................................................................... asterisk: Introduce AMI_Adapter_CT This allows to keep string handling totally internal to the AMI_Adapter component, which also means now the CLIENT port acts asynchronously on full AMI messages. This allows for instance using activated altsteps to ignore events or answer to them. Change-Id: Ibf230d2302fecf443f34e1c4d4acfd4802f4cc79 --- M asterisk/AMI_Functions.ttcn M asterisk/Asterisk_Tests.ttcn 2 files changed, 126 insertions(+), 48 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn index 72420e1..6e0b8d0 100644 --- a/asterisk/AMI_Functions.ttcn +++ b/asterisk/AMI_Functions.ttcn @@ -167,6 +167,58 @@ tr_AMI_Field_ActionId(action_id) ); + +/*********************** + * Adapter: + ***********************/ + +type port AMI_Msg_PT message { + inout AMI_Msg; +} with { extension "internal" }; + +type component AMI_Adapter_CT { + port TELNETasp_PT AMI; + port AMI_Msg_PT CLIENT; +} + +function f_AMI_Adapter_main() runs on AMI_Adapter_CT { + var AMI_Msg msg; + + var charstring rx, buf := ""; + var integer fd; + + map(self:AMI, system:AMI); + + while (true) { + + alt { + [] AMI.receive(pattern "\n") { + buf := buf & "\n"; + msg := dec_AMI_Msg(buf); + buf := ""; + CLIENT.send(msg); + }; + [] AMI.receive(charstring:?) -> value rx { + buf := buf & rx; + }; + [] AMI.receive(integer:?) -> value fd { + if (fd == -1) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "AMI Telnet Connection Failure: " & int2str(fd)); + } else { + /* telnet connection succeeded */ + } + } + [] CLIENT.receive(AMI_Msg:?) -> value msg { + /* TODO: in the future, queue Action if there's already one Action in transit, to fullfill AMI requirements. */ + var charstring tx_txt := enc_AMI_Msg(msg); + AMI.send(tx_txt); + } + } + } +} + + /* * Functions: */ @@ -223,62 +275,66 @@ return field.val; } -private function f_ami_wait_for_prompt_str(TELNETasp_PT pt, charstring log_label := "(?)") -return charstring { - var charstring rx, buf := ""; - var integer fd; +function f_ami_transceive_ret(AMI_Msg_PT pt, template (value) AMI_Msg tx_msg, float rx_timeout := 10.0) return AMI_Msg { + var AMI_Msg rx_msg; timer T; - T.start(mp_ami_prompt_timeout); + T.start(rx_timeout); + pt.send(tx_msg); alt { - [] pt.receive(pattern "\n") { buf := buf & "\n" }; - [] pt.receive(charstring:?) -> value rx { buf := buf & rx; repeat }; - [] pt.receive(integer:?) -> value fd { - if (fd == -1) { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - "AMI Telnet Connection Failure: " & log_label); - } else { - repeat; /* telnet connection succeeded */ - } - } + [] pt.receive(AMI_Msg:?) -> value rx_msg; [] T.timeout { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - "AMI Timeout for prompt: " & log_label); - }; + log2str("AMI Response timeout: ", tx_msg)); + } } T.stop; - return buf; + return rx_msg; + } -function f_ami_wait_for_prompt(TELNETasp_PT pt, charstring log_label := "(?)") return AMI_Msg { - var charstring buf := f_ami_wait_for_prompt_str(pt, log_label); - var AMI_Msg msg := dec_AMI_Msg(buf); - return msg; -} - -/* send a AMI command and obtain response until prompt is received */ -private function f_ami_transceive_ret_str(TELNETasp_PT pt, charstring tx) return charstring { - pt.send(tx); - return f_ami_wait_for_prompt_str(pt, tx); -} - -function f_ami_transceive_ret(TELNETasp_PT pt, template (value) AMI_Msg tx_msg) return AMI_Msg { - var charstring tx_txt := enc_AMI_Msg(valueof(tx_msg)); - var charstring resp_txt := f_ami_transceive_ret_str(pt, tx_txt); - return dec_AMI_Msg(resp_txt); -} - -function f_ami_transceive_match(TELNETasp_PT pt, - template (value) AMI_Msg tx_msg, - template (present) AMI_Msg exp_ret := ?) { - var AMI_Msg ret := f_ami_transceive_ret(pt, tx_msg); - if (not match(ret, exp_ret)) { +private altstep as_ami_rx_fail(AMI_Msg_PT pt, template AMI_Msg exp_msg := *) +{ + var AMI_Msg msg; + [] pt.receive(AMI_Msg:?) -> value msg { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - log2str("Non-matching AMI response: ", ret, " vs exp: ", exp_ret)); + log2str("Received unexpected AMI message := ", msg, "\nvs exp := ", exp_msg)); } } -function f_ami_transceive_match_response_success(TELNETasp_PT pt, +altstep as_ami_expect_msg(AMI_Msg_PT pt, template (present) AMI_Msg msg_expect, boolean fail_others := true) +{ + [] pt.receive(msg_expect); + [fail_others] as_ami_rx_fail(pt, msg_expect); +} + +function f_ami_transceive_match(AMI_Msg_PT pt, + template (value) AMI_Msg tx_msg, + template (present) AMI_Msg exp_ret := ?, + boolean fail_others := true, + float rx_timeout := 10.0) return AMI_Msg { + var AMI_Msg rx_msg; + timer T; + + T.start(rx_timeout); + pt.send(tx_msg); + alt { + [] pt.receive(exp_ret) -> value rx_msg; + [not fail_others] pt.receive(AMI_Msg:?) -> value rx_msg { + log("AMI: Ignoring Rx msg ", rx_msg); + repeat; + } + [fail_others] as_ami_rx_fail(pt, exp_ret); + [] T.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("AMI Response timeout: ", tx_msg)); + } + } + T.stop; + return rx_msg; +} + +function f_ami_transceive_match_response_success(AMI_Msg_PT pt, template (value) AMI_Msg tx_msg) { var template (present) AMI_Msg exp_resp; var template (omit) charstring action_id := f_ami_msg_get_value(valueof(tx_msg), AMI_FIELD_ACTION_ID); @@ -290,11 +346,11 @@ f_ami_transceive_match(pt, tx_msg, exp_resp); } -function f_ami_action_login(TELNETasp_PT pt, charstring username, charstring secret) { +function f_ami_action_login(AMI_Msg_PT pt, charstring username, charstring secret) { f_ami_transceive_match_response_success(pt, ts_AMI_Action_Login(username, secret)); } -function f_ami_action_PJSIPRegister(TELNETasp_PT pt, charstring register) { +function f_ami_action_PJSIPRegister(AMI_Msg_PT pt, charstring register) { var charstring reg_action_id := f_gen_action_id(); f_ami_transceive_match_response_success(pt, ts_AMI_Action_PJSIPRegister(register, reg_action_id)); } diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index c94f97f..d2fc0d5 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -49,7 +49,9 @@ /* Manages the IMS server Asterisk connects to: */ var SIP_Emulation_CT vc_IMS; - port TELNETasp_PT AMI; + /* Connection towards Asterisk AMI iface: */ + var AMI_Adapter_CT vc_AMI; + port AMI_Msg_PT AMI_CLIENT; port Coord_PT COORD; port IMSCoord_PT IMS_COORD; @@ -70,8 +72,13 @@ /* Initialize connection towards Asterisk AMI */ private function f_init_ami() runs on test_CT { - map(self:AMI, system:AMI); - f_ami_action_login(AMI, mp_ami_user, mp_ami_secret); + var charstring id := "Asterisk_Tests_AMI_EMU"; + vc_AMI := AMI_Adapter_CT.create(id); + connect(self:AMI_CLIENT, vc_AMI:CLIENT); + vc_AMI.start(f_AMI_Adapter_main()); + + + f_ami_action_login(AMI_CLIENT, mp_ami_user, mp_ami_secret); } /* Local SIP UAs */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36711?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: Ibf230d2302fecf443f34e1c4d4acfd4802f4cc79 Gerrit-Change-Number: 36711 Gerrit-PatchSet: 4 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: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 1 month

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Implement AMI_Adapter using IPL4 instead of TELNET

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755?usp=email ) Change subject: asterisk: Implement AMI_Adapter using IPL4 instead of TELNET ...................................................................... Patch Set 3: (1 comment) File asterisk/AMI_Functions.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755/comment/e98ef540_60d2… PS3, Line 480: log("AMI_Msg decoded: ", msg); > add some sort of assert / check at the end, that the decode lead to the expected result? That's more like a playground to test stuff interactively (recompile, test, etc.) not something really being run during usual testsuite. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755?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: Icaf2860c1dd4befa4498f0d176cfadf26cfa8d1d Gerrit-Change-Number: 36755 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 May 2024 12:54:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Implement AMI_Adapter using IPL4 instead of TELNET

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755?usp=email ) Change subject: asterisk: Implement AMI_Adapter using IPL4 instead of TELNET ...................................................................... Patch Set 3: (1 comment) File asterisk/AMI_Functions.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755/comment/a6484644_acca… PS3, Line 260: /* TEXT Enc/dec is not happy with values containing "; ", get rid of them: : * "AppData: 5,0502: Call pjsip endpoint from 0501\r\n" */ : var integer pos := f_strstr(patched_txt, "AppData: ", 0); : if (pos >= 0) { : var integer pos_end := f_strstr(patched_txt, "\r\n", pos) + lengthof("\r\n"); : var charstring to_remove := substr(patched_txt, pos, pos_end - pos); : patched_txt := f_str_replace(patched_txt, to_remove, ""); : } > I don't understand what this does. […] It's removing the full line "AppData: 5,0502: Call pjsip endpoint from 0501\r\n", since we don't need it for now and just breaks the decoder (yes, this all should be fixed better at a later point in in TITAN TEXT decoder). 1- Find pos of "AppData" substr start. 2- From there, find where the line finishes by finding "\r\n". 3- Create a substr of that line. 4- Use f_str_replace() to remove that line entirely. EDIT: Ah! I see what you mean, I put a typo in the comment, I meant ": ". -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755?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: Icaf2860c1dd4befa4498f0d176cfadf26cfa8d1d Gerrit-Change-Number: 36755 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 May 2024 12:53:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-dev[master]: src/grd: urlencode / in project names

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/36765?usp=email ) Change subject: src/grd: urlencode / in project names ...................................................................... src/grd: urlencode / in project names Fix that it didn't work with projects that contain a slash character, such as erlang/osmo-epdg. Change-Id: I810d6d0654ab8f3019c00e32762edfef7e7350a7 --- M src/grd 1 file changed, 15 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/src/grd b/src/grd index 0ca5df7..e149c6f 100755 --- a/src/grd +++ b/src/grd @@ -9,6 +9,7 @@ import os import subprocess import urllib.request +import urllib.parse def get_topdir(): @@ -37,7 +38,8 @@ def get_gerrit_details(host, project, patch_id, verbose): - url = f"https://{host}/changes/{project}~{args.patch_id}/detail" + project_q = urllib.parse.quote(project, "") + url = f"https://{host}/changes/{project_q}~{args.patch_id}/detail" print(f"Download {url}") with urllib.request.urlopen(url) as response: content = response.read().decode() -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36765?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I810d6d0654ab8f3019c00e32762edfef7e7350a7 Gerrit-Change-Number: 36765 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 1 month

1
0
0 0

[S] Change in osmo-dev[master]: ttcn3.sh: prepare_local_bin: always copy scripts

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/36766?usp=email ) Change subject: ttcn3.sh: prepare_local_bin: always copy scripts ...................................................................... ttcn3.sh: prepare_local_bin: always copy scripts Always copy ttcn3-docker-run.sh from docker-playground.git, so we don't use an outdated version if the file has changed. Change-Id: I52df1da96a1848c5a4c054bb6bc9584074e9c35e --- M ttcn3/ttcn3.sh 1 file changed, 12 insertions(+), 3 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index f3d3b7c..780a4ba 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -297,9 +297,6 @@ esac script_path_localbin="$DIR_USR_LOCAL/bin/$name_install" - if [ -x "$script_path_localbin" ]; then - continue - fi install -v -Dm755 "$script" "$script_path_localbin" done -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36766?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I52df1da96a1848c5a4c054bb6bc9584074e9c35e Gerrit-Change-Number: 36766 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 1 month

1
0
0 0

[S] Change in osmo-dev[master]: ttcn3.sh: add -c CONFIG argument

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/36768?usp=email ) Change subject: ttcn3.sh: add -c CONFIG argument ...................................................................... ttcn3.sh: add -c CONFIG argument Allow only running one of the ttcn3-bts-test configurations, instead of running all of them. Depends: docker-playground I1dce5e6aa4b5d67f9f8c96ced611ab2875c353c8 Change-Id: I46028824847ffc2d0768d32c138ccd32a6c8c769 --- M ttcn3/ttcn3.sh 1 file changed, 23 insertions(+), 2 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index a458f5b..7cdf4c1 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -10,6 +10,7 @@ KERNEL_DIR="" KERNEL_SKIP_MARKER="$DIR_MAKE/.kernel_built_from_source" ARG_TEST_NAME="" +ARG_TEST_CONFIGS="" DOCKER_IMG_TITAN="debian-bookworm-titan" clean() { @@ -43,11 +44,14 @@ } parse_args() { - while getopts 'ht:dkf' OPTION; do + while getopts 'ht:c:dkf' OPTION; do case "$OPTION" in t) ARG_TEST_NAME="$OPTARG" ;; + c) + ARG_TEST_CONFIGS="$OPTARG" + ;; d) if [ -n "$KERNEL_TEST" ]; then echo "ERROR: use either -d or -k" @@ -81,12 +85,13 @@ ;; h|*) local name="$(basename $0)" - echo "usage: $name [-h] [-t TESTNAME] [-d|-k [-f]] PROJECT" + echo "usage: $name [-h] [-t TESTNAME] [-c CONFIG] [-d|-k [-f]] PROJECT" echo " or: $name clean" echo echo "arguments:" echo " -h show help" echo " -t only run the test with this name" + echo " -c only run test configuration with this name" echo echo "arguments for kernel tests:" echo " -d run kernel tests with debian kernel" @@ -106,6 +111,7 @@ echo " $name hss" echo " $name mme" echo " $name pgw" + echo " $name -t TC_est_dchan -c generic bts" exit 1 ;; esac @@ -482,8 +488,10 @@ if [ -n "$ARG_TEST_NAME" ]; then DOCKER_ARGS="$DOCKER_ARGS -e TEST_NAME=$ARG_TEST_NAME" fi + export DOCKER_ARGS export NO_LIST_OSMO_PACKAGES=1 + export TEST_CONFIGS="$ARG_TEST_CONFIGS" ./jenkins.sh touch "$marker" -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36768?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I46028824847ffc2d0768d32c138ccd32a6c8c769 Gerrit-Change-Number: 36768 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 1 month

1
0
0 0

[S] Change in osmo-dev[master]: ttcn3.sh: bts: fix missing trxcon dependency

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/36767?usp=email ) Change subject: ttcn3.sh: bts: fix missing trxcon dependency ...................................................................... ttcn3.sh: bts: fix missing trxcon dependency Change-Id: Ia4a588842921e4382d46d3b905bba6aab3ef3359 --- M all.deps M gen_makefile.py M ttcn3/ttcn3.sh 3 files changed, 23 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/all.deps b/all.deps index 5a1191a..398ebec 100644 --- a/all.deps +++ b/all.deps @@ -48,4 +48,5 @@ # configure.ac not in topdir of repository osmocom-bb_layer23 libosmocore osmocom-bb_virtphy libosmocore +osmocom-bb_trxcon libosmocore simtrace2_host libosmocore diff --git a/gen_makefile.py b/gen_makefile.py index 3f6a994..9b896b2 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -188,6 +188,14 @@ touch $@ ''' + if proj == "osmocom-bb_trxcon": + return f''' +.make.{proj}.clone: .make.osmocom-bb.clone + @echo -e "\\n\\n\\n===== $@\\n" + test -L {src_proj} || ln -s osmocom-bb/src/host/trxcon {src_proj} + touch $@ + ''' + if proj == "simtrace2_host": return f''' .make.{proj}.clone: .make.simtrace2.clone @@ -512,6 +520,9 @@ .PHONY: virtphy virtphy: osmocom-bb_virtphy +.PHONY: trxcon +trxcon: osmocom-bb_trxcon + # # Other convenience targets # diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index 780a4ba..a458f5b 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -195,7 +195,7 @@ # Osmocom bsc|bsc-*) echo "osmo-stp osmo-bsc osmo-bts-omldummy" ;; - bts) echo "osmo-bsc osmo-bts-trx" ;; + bts) echo "osmo-bsc osmo-bts-trx trxcon" ;; msc) echo "osmo-stp osmo-msc" ;; pcu-sns) echo "osmo-pcu" ;; pcu) echo "osmo-pcu osmo-bsc osmo-bts-virtual" ;; @@ -213,6 +213,7 @@ osmo-pcap-*) echo "osmo-pcap" ;; osmo-stp) echo "libosmo-sccp" ;; osmo-uecups-*) echo "osmo-uecups" ;; + trxcon) echo "osmocom-bb_trxcon" ;; *) echo "$1" ;; esac } -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36767?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ia4a588842921e4382d46d3b905bba6aab3ef3359 Gerrit-Change-Number: 36767 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2024