From c90560f64fff5fa490ae965c6e9a4c37f2939d2a Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Tue, 8 Sep 2020 20:09:37 +0200 Subject: [PATCH] ttcn3-mgw: Update module param addresses naming to support ipv6 Depends: osmo-ttcn3-hacks.git Change-Id Ia393d7175de277ec8fa524ba74bf3b150b74c766 Change-Id: I2840eeee8ae53dc8bdf96ce7b6c76e4c8e0af859 --- ttcn3-mgw-test/MGCP_Test.cfg | 6 ++++-- ttcn3-mgw-test/jenkins.sh | 2 ++ ttcn3-mgw-test/osmo-mgw.cfg | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ttcn3-mgw-test/MGCP_Test.cfg b/ttcn3-mgw-test/MGCP_Test.cfg index 0c6a5500..b70514e9 100644 --- a/ttcn3-mgw-test/MGCP_Test.cfg +++ b/ttcn3-mgw-test/MGCP_Test.cfg @@ -8,8 +8,10 @@ *.MGWVTY.CTRL_HOSTNAME := "172.18.4.180" [MODULE_PARAMETERS] -mp_local_ip:= "172.18.4.181"; -mp_remote_ip:= "172.18.4.180"; +mp_local_ipv4 := "172.18.4.181"; +mp_local_ipv6 := "fd02:db8:4::181"; +mp_remote_ipv4 := "172.18.4.180"; +mp_remote_ipv6 := "fd02:db8:4::180"; [MAIN_CONTROLLER] diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh index 228740b8..c49096b2 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -20,6 +20,8 @@ if [ "$IMAGE_SUFFIX" = "latest" ]; then sed -i "s/e1_line.*//" $VOL_BASE_DIR/mgw/osmo-mgw.cfg sed -i "s/e1_input.*//" $VOL_BASE_DIR/mgw/osmo-mgw.cfg sed -i "s/line 0.*//" $VOL_BASE_DIR/mgw/osmo-mgw.cfg + # Disable IPv6 until osmo-mgw .git release > 1.7.0 is available + sed "/fd02:db8/d" -i $VOL_BASE_DIR/mgw/osmo-mgw.cfg fi # start container with mgw in background diff --git a/ttcn3-mgw-test/osmo-mgw.cfg b/ttcn3-mgw-test/osmo-mgw.cfg index 8036058c..1c49b11d 100644 --- a/ttcn3-mgw-test/osmo-mgw.cfg +++ b/ttcn3-mgw-test/osmo-mgw.cfg @@ -31,6 +31,7 @@ mgcp bind port 2427 rtp port-range 4002 16000 rtp bind-ip 172.18.4.180 + rtp bind-ip-v6 fd02:db8:4::180 rtp ip-probing rtp ip-dscp 184 no rtp keep-alive