pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36651?usp=email )
Change subject: asterisk: manager.conf: Give more permissions to AMI user
......................................................................
asterisk: manager.conf: Give more permissions to AMI user
These are required to use eg. PJSIPRegister command, otherwise Asterisk
answers with "Permission Denied".
It also seems to help in getting more events from Asterisk.
Change-Id: Ia77a9d88758f648a5539dbc7511b75c20fe7dd6b
---
M ttcn3-asterisk-ims-ue-test/asterisk/manager.conf
1 file changed, 16 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/51/36651/1
diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/manager.conf b/ttcn3-asterisk-ims-ue-test/asterisk/manager.conf
index ea6d1ac..67f7b02 100644
--- a/ttcn3-asterisk-ims-ue-test/asterisk/manager.conf
+++ b/ttcn3-asterisk-ims-ue-test/asterisk/manager.conf
@@ -9,3 +9,5 @@
secret = 1234
;deny=0.0.0.0/0.0.0.0
permit=172.18.11.103/255.255.0.0
+read = all,system,call,log,verbose,command,agent,user
+write = all,system,call,log,verbose,command,agent,user
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36651?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ia77a9d88758f648a5539dbc7511b75c20fe7dd6b
Gerrit-Change-Number: 36651
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36649?usp=email )
Change subject: asterisk-master: Use pjproject from external git repo
......................................................................
asterisk-master: Use pjproject from external git repo
By default, asterisk.git build system will fetch pjproject tarball from
https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/$(P…,
where PJPROJECT_VERSION is defined in asterisk/third-party/versions.mak:
PJPROJECT_VERSION=2.14
On top of that, it applies some patches adapting build system, found in
asterisk/third-party/pjproject/patches/.
The build system also allows to use an out-of-tree pjproject (eg from a
git repo) by symlinking the directory to
asterisk/third-party/pjprojec/source/.
This is all documented in asterisk/third-party/pjproject/README-hacking.md.
Since we want to develop on pjproject too, fetch our own pjproject.git
repo, where we can push changes, and build asterisk using that repo.
Bear in mind that, when asterisk.git builds with out-of-tree pjproject,
it wont apply pjproject patches under asterisk.git/third-party/pjproject/patches.
Hence, I created an "asterisk/2.14" branch in our pjproject.git repo which points
to tag "2.14" (the one used by asterisk 20.7.0, which we use), and has the 2 patches
applied on top.
Then, we have our own "sysmocom/2.14" branch on top of that "asterisk/2.14"
branch, where we put our development. WIP development can also be done in whatever
branch on top of "asterisk/2.14" branch.
Change-Id: I73f3323db1b6897fc43215578b0a011fdb6909c5
---
M asterisk-master/Dockerfile
M make/Makefile
2 files changed, 51 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/49/36649/1
diff --git a/asterisk-master/Dockerfile b/asterisk-master/Dockerfile
index cd64b2f..789aeb5 100644
--- a/asterisk-master/Dockerfile
+++ b/asterisk-master/Dockerfile
@@ -36,6 +36,17 @@
WORKDIR /home/${username}
+# clone pjproject
+ARG PJPROJECT_REMOTE=https://gitea.sysmocom.de/sysmocom/pjproject.git
+ARG PJPROJECT_BRANCH=sysmocom/2.14
+
+RUN git clone $PJPROJECT_REMOTE
+ADD https://gitea.sysmocom.de/api/v1/repos/sysmocom/pjproject/git/refs/heads/$P… /tmp/pjproject-ver
+
+RUN cd pjproject && \
+ git fetch && git checkout $PJPROJECT_BRANCH && \
+ (git symbolic-ref -q HEAD && git reset --hard origin/$PJPROJECT_BRANCH || exit 1); \
+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD
# clone asterisk
ARG ASTERISK_REMOTE=https://gitea.sysmocom.de/sysmocom/asterisk.git
@@ -44,6 +55,10 @@
RUN cd asterisk && \
git fetch && git checkout -f -B sysmocom/master origin/sysmocom/master
+# Use pjproject from git repo above instead of downloading tar.gz:
+RUN cd asterisk/third-party/pjproject && \
+ ln -s ../../../pjproject/ source
+
RUN cd asterisk && \
./bootstrap.sh && \
./configure && \
diff --git a/make/Makefile b/make/Makefile
index 74efbff..24308e5 100644
--- a/make/Makefile
+++ b/make/Makefile
@@ -42,6 +42,7 @@
OSMO_STP_BRANCH?=master
OSMO_UECUPS_BRANCH?=master
OPEN5GS_BRANCH?=main
+PJPROJECT_BRANCH?=sysmocom/2.14
BUILD_ARGS?=
RUN_ARGS?=-it
UPSTREAM_DISTRO?=debian:bookworm
@@ -125,6 +126,7 @@
--build-arg OSMO_STP_BRANCH=$(OSMO_STP_BRANCH) \
--build-arg OSMO_UECUPS_BRANCH=$(OSMO_UECUPS_BRANCH) \
--build-arg OPEN5GS_BRANCH=$(OPEN5GS_BRANCH) \
+ --build-arg PJPROJECT_BRANCH=$(PJPROJECT_BRANCH) \
$(BUILD_ARGS) -t $(IMAGE):latest .
@DOCKER_MAJOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' | cut -d\. -f1) ; \
DOCKER_MINOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' | cut -d\. -f2) ; \
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36649?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I73f3323db1b6897fc43215578b0a011fdb6909c5
Gerrit-Change-Number: 36649
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36644?usp=email )
Change subject: SIP_Templates: tr_SIP_REGISTER(): Pass via field directly as a param
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36644?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: I9fe477370e028543b04dee35a3285ddae6bb2c59
Gerrit-Change-Number: 36644
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 26 Apr 2024 15:07:11 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: fixeria, laforge, osmith.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36641?usp=email )
Change subject: SIP_Emulation: Rename component id
......................................................................
Patch Set 1:
(1 comment)
Commit Message:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36641/comment/ba0f81d0_3e25…
PS1, Line 9: it makes it impossible to reference the
: component name under TESTPORT_PARAMETERS
> If renaming stuff & refactoring code is easier for you, then I have nothing to say :D
Is already done anyway, so nothing really to discuss about regarding this hypothesis I think.
The point now is that:
* This new name makes it easier to relate to the component owning the name (SIP_Emulation).
* This new new doesn't need to be escaped when used in config files.
> I don't see a connection with the component name escaping.
Because ofc spaces also need to be escaped, which causes trouble.
> The problem, though, is that this patch brings inconsistency to the code.
I think you are still talking about some imaginary name consistency plan/architecture done by a brilliant mind when writing all testsuites here. I don't think there was ever such a a plan nor was brought up by anyone.
I don't see a point to it anyway, since the components can be used differently in different testsuites.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36641?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: Iecefe7d98a5842872f1efc55e013f672186ef1a8
Gerrit-Change-Number: 36641
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 26 Apr 2024 13:57:29 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: laforge, osmith, pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36641?usp=email )
Change subject: SIP_Emulation: Rename component id
......................................................................
Patch Set 1:
(1 comment)
Commit Message:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36641/comment/c8430c6d_29a7…
PS1, Line 9: it makes it impossible to reference the
: component name under TESTPORT_PARAMETERS
> This scaping of dashes through quotes looks more like a workaround placed after the name was place, and imo makes everything more difficult for no good reason.
So you're saying using quotes makes everything more difficult for no good reason? To me this patch looks like a workaround for a problem, which is not really a problem, because TITAN provides means to reference components with dashes in the names out of the box. If renaming stuff & refactoring code is easier for you, then I have nothing to say :D
> It's like putting spaces in files. Can be done? yes? Should we? No.
I don't see a connection with the component name escaping.
> I'm not aware we have a comprehensive guide on how to name components that we have to follow :)
Just like with many other things we tend to follow in the code base.
One can always use this as an excuse to avoid addressing code review.
The problem, though, is that this patch brings inconsistency to the code.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36641?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: Iecefe7d98a5842872f1efc55e013f672186ef1a8
Gerrit-Change-Number: 36641
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 26 Apr 2024 13:46:50 +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>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: osmith.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36642?usp=email )
Change subject: asterisk: Initial steps to emulate IMS core
......................................................................
Patch Set 1:
(1 comment)
File asterisk/Asterisk_Tests.default:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36642/comment/288498e1_0a77…
PS1, Line 7: #*.*.DEBUG := "yes"
: #*.*.debug := "enabled"
> unrelated change?
Everything is still under heavy development, this commit is just a step to avoid later patches growing in size. I'm simply leaving those commented since they may be useful when debugging SIPmst_PT later on.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36642?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: Ibbbadd54b7facf4ef7384499704e742f482a1252
Gerrit-Change-Number: 36642
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 26 Apr 2024 12:01:33 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: comment