pespin has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/36999?usp=email )
Change subject: ttcn3-asterisk: Use dnsmasq to let asterisk resolve IMS DNS
......................................................................
ttcn3-asterisk: Use dnsmasq to let asterisk resolve IMS DNS
Depends: osmo-ttcn3-hacks.git Change-Id
I23afdc8b70132dbd947c280f6e5aadbc84849f01
Change-Id: I2da10c80a81ef5603082e4ee1445a39745c0c24f
---
M ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg
M ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh
M ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf
A ttcn3-asterisk-ims-ue-test/dnsmasq/dnsmasq.conf
M ttcn3-asterisk-ims-ue-test/jenkins.sh
5 files changed, 52 insertions(+), 5 deletions(-)
Approvals:
osmith: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg
b/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg
index d183cad..a7576e6 100644
--- a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg
+++ b/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg
@@ -22,6 +22,7 @@
Asterisk_Tests.mp_remote_sip_port := 5094
Asterisk_Tests.mp_local_ims_host := "172.18.11.103"
Asterisk_Tests.mp_local_ims_port := 5060
+Asterisk_Tests.mp_ims_domain := "ims.mnc001.mcc238.3gppnetwork.org"
Asterisk_Tests.mp_ims_imsi := "238010000090828"
Asterisk_Tests.mp_ami_remote_host := "172.18.11.10"
IMS_ConnectionHandler.mp_ipsec_setup_script_path :=
"/osmo-ttcn3-hacks/asterisk/IMS_ipsec_setup.sh"
diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh
b/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh
index b31015f..0629e20 100755
--- a/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh
+++ b/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh
@@ -3,6 +3,9 @@
set -x
ASTERISK_CFG_PATH="/etc/asterisk"
+DNSMASQ_IPADDR="172.18.11.200"
+
+echo "nameserver $DNSMASQ_IPADDR" > /etc/resolv.conf
#rm -rf "${ASTERISK_CFG_PATH}"
#mkdir -p "${ASTERISK_CFG_PATH}"
diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf
b/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf
index 82c4d5a..85c910e 100644
--- a/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf
+++ b/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf
@@ -84,8 +84,8 @@
type=registration
transport=transport-tcp
outbound_auth=volte_ims
-server_uri=sip:172.18.11.103
-client_uri=sip:238010000090828@172.18.11.103
+server_uri=sip:ims.mnc001.mcc238.3gppnetwork.org
+client_uri=sip:238010000090...@ims.mnc001.mcc238.3gppnetwork.org
retry_interval=30
fatal_retry_interval=30
expiration=600000
@@ -110,7 +110,7 @@
[volte_ims]
type=auth
auth_type=ims_aka
-username=238010000090828@172.18.11.103
+username=238010000090...@ims.mnc001.mcc238.3gppnetwork.org
usim_ami=yes
usim_opc=775A1F887D2AD66F9719C2C79F847B50
usim_k=D534E07854B75E475C667A856AA31F9C
@@ -118,5 +118,5 @@
[volte_ims]
type=aor
-contact=sip:238010000090828@172.18.11.103
+contact=sip:238010000090...@ims.mnc001.mcc238.3gppnetwork.org
max_contacts=1
diff --git a/ttcn3-asterisk-ims-ue-test/dnsmasq/dnsmasq.conf
b/ttcn3-asterisk-ims-ue-test/dnsmasq/dnsmasq.conf
new file mode 100644
index 0000000..b2430ff
--- /dev/null
+++ b/ttcn3-asterisk-ims-ue-test/dnsmasq/dnsmasq.conf
@@ -0,0 +1,19 @@
+#log all dns queries
+log-queries
+#dont use hosts nameservers
+no-resolv
+listen-address=::1,127.0.0.1,172.18.11.200
+
+#use google as default nameservers
+server=8.8.4.4
+server=8.8.8.8
+
+# PCSCF IP!
+host-record=ims.mnc001.mcc238.3gppnetwork.org,172.18.11.103
+srv-host=_sip._tcp.ims.mnc001.mcc238.3gppnetwork.org,ims.mnc001.mcc238.3gppnetwork.org,5060
+srv-host=_sip._udp.ims.mnc001.mcc238.3gppnetwork.org,ims.mnc001.mcc238.3gppnetwork.org,5060
+
+#naptr-record= <name>
,<order>,<preference>,<flags>,<service>,<regexp>[,<replacement>]
+#naptr-record=ims.mnc001.mcc238.3gppnetwork.org, 2, 0 ,s ,SIP+D2U
,"" ,_sip._udp.ims.mnc001.mcc238.3gppnetwork.org
+naptr-record=ims.mnc001.mcc238.3gppnetwork.org,0,0,s,SIP+D2U,!(.*)!_sip._udp.\1!
+naptr-record=ims.mnc001.mcc238.3gppnetwork.org,0,0,s,SIP+D2T,!(.*)!_sip._tcp.\1!
\ No newline at end of file
diff --git a/ttcn3-asterisk-ims-ue-test/jenkins.sh
b/ttcn3-asterisk-ims-ue-test/jenkins.sh
index 98d27b8..7e94fa5 100755
--- a/ttcn3-asterisk-ims-ue-test/jenkins.sh
+++ b/ttcn3-asterisk-ims-ue-test/jenkins.sh
@@ -4,11 +4,15 @@
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
docker_images_require \
"asterisk-$IMAGE_SUFFIX" \
- "ttcn3-asterisk-ims-ue-test"
+ "ttcn3-asterisk-ims-ue-test" \
+ "dnsmasq"
set_clean_up_trap
set -e
+mkdir $VOL_BASE_DIR/dnsmasq
+cp dnsmasq/* $VOL_BASE_DIR/dnsmasq/
+
mkdir $VOL_BASE_DIR/asterisk-ims-ue-tester
mkdir $VOL_BASE_DIR/asterisk-ims-ue-tester/unix
cp Asterisk_Tests.cfg $VOL_BASE_DIR/asterisk-ims-ue-tester/
@@ -20,6 +24,16 @@
network_create
network_replace_subnet_in_configs
+echo Starting container with dnsmasq
+docker run --rm \
+ --cap-add=NET_ADMIN \
+ $(docker_network_params $SUBNET 200) \
+ --ulimit core=-1 \
+ -v $VOL_BASE_DIR/dnsmasq:/data \
+ --name ${BUILD_TAG}-dnsmasq -d \
+ $DOCKER_ARGS \
+ $REPO_USER/dnsmasq
+
echo Starting container with Asterisk
docker run --rm \
--cap-add=NET_ADMIN \
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36999?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: I2da10c80a81ef5603082e4ee1445a39745c0c24f
Gerrit-Change-Number: 36999
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pes...@sysmocom.de>
Gerrit-Reviewer: Hoernchen <ew...@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <lafo...@osmocom.org>
Gerrit-Reviewer: osmith <osm...@sysmocom.de>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-MessageType: merged
