<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/19771">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ttcn3-stp: Configure M3UA setup to use IPv6 together with IPv4<br><br>Depends: libosmo-sccp.git Change-Id I09226a5cecc37dd4676acd61c2051befe5234cb3<br>Depends: osmo-ttcn3-hacks.git Change-Id Ib1925ed1df5cea3fa66f28b5625532d454a2c338<br>Change-Id: Id6e197cc3ba71e36f29ceec44742b7452a47b36b<br>---<br>M ttcn3-stp-test/STP_Tests.cfg<br>M ttcn3-stp-test/jenkins.sh<br>M ttcn3-stp-test/osmo-stp.cfg<br>3 files changed, 23 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ttcn3-stp-test/STP_Tests.cfg b/ttcn3-stp-test/STP_Tests.cfg</span><br><span>index ec95058..5a95e9a 100644</span><br><span>--- a/ttcn3-stp-test/STP_Tests.cfg</span><br><span>+++ b/ttcn3-stp-test/STP_Tests.cfg</span><br><span>@@ -9,8 +9,10 @@</span><br><span> *.VTY.CTRL_HOSTNAME := "172.18.19.200"</span><br><span> </span><br><span> [MODULE_PARAMETERS]</span><br><span style="color: hsl(0, 100%, 40%);">-STP_Tests_Common.mp_stp_ip := "172.18.19.200";</span><br><span style="color: hsl(0, 100%, 40%);">-STP_Tests_Common.mp_local_ip := "172.18.19.203";</span><br><span style="color: hsl(120, 100%, 40%);">+STP_Tests_IPA.mp_stp_ipa_ip := "172.18.19.200";</span><br><span style="color: hsl(120, 100%, 40%);">+STP_Tests_M3UA.mp_stp_m3ua_ip := { "172.18.19.200", "fd02:db8:19::200" };</span><br><span style="color: hsl(120, 100%, 40%);">+STP_Tests_IPA.mp_local_ipa_ip := "172.18.19.203";</span><br><span style="color: hsl(120, 100%, 40%);">+STP_Tests_M3UA.mp_local_m3ua_ip := { "172.18.19.203", "fd02:db8:19::203" };</span><br><span> </span><br><span> </span><br><span> </span><br><span>diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh</span><br><span>index 6b6a2de..a53c58b 100755</span><br><span>--- a/ttcn3-stp-test/jenkins.sh</span><br><span>+++ b/ttcn3-stp-test/jenkins.sh</span><br><span>@@ -12,11 +12,18 @@</span><br><span> mkdir $VOL_BASE_DIR/stp</span><br><span> cp osmo-stp.cfg $VOL_BASE_DIR/stp/</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# Disable IPv6 until libosmo-sccp.git release > 1.3.0 is available</span><br><span style="color: hsl(120, 100%, 40%);">+if [ "$IMAGE_SUFFIX" = "latest" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ sed "/fd02:db8/d" -i "$VOL_BASE_DIR/stp/osmo-stp.cfg"</span><br><span style="color: hsl(120, 100%, 40%);">+ sed 's/, "fd02:db8:19::203"//g' -i "$VOL_BASE_DIR/stp-tester/STP_Tests.cfg"</span><br><span style="color: hsl(120, 100%, 40%);">+ sed 's/, "fd02:db8:19::200"//g' -i "$VOL_BASE_DIR/stp-tester/STP_Tests.cfg"</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> network_create 19</span><br><span> </span><br><span> echo Starting container with STP</span><br><span> docker run --rm \</span><br><span style="color: hsl(0, 100%, 40%);">- --network $NET_NAME --ip 172.18.19.200 \</span><br><span style="color: hsl(120, 100%, 40%);">+ --network $NET_NAME --ip 172.18.19.200 --ip6 fd02:db8:19::200 \</span><br><span> --ulimit core=-1 \</span><br><span> -v $VOL_BASE_DIR/stp:/data \</span><br><span> --name ${BUILD_TAG}-stp -d \</span><br><span>@@ -25,7 +32,7 @@</span><br><span> </span><br><span> echo Starting container with STP testsuite</span><br><span> docker run --rm \</span><br><span style="color: hsl(0, 100%, 40%);">- --network $NET_NAME --ip 172.18.19.203 \</span><br><span style="color: hsl(120, 100%, 40%);">+ --network $NET_NAME --ip 172.18.19.203 --ip6 fd02:db8:19::203 \</span><br><span> --ulimit core=-1 \</span><br><span> -e "TTCN3_PCAP_PATH=/data" \</span><br><span> -v $VOL_BASE_DIR/stp-tester:/data \</span><br><span>diff --git a/ttcn3-stp-test/osmo-stp.cfg b/ttcn3-stp-test/osmo-stp.cfg</span><br><span>index 20fb298..9e4447c 100644</span><br><span>--- a/ttcn3-stp-test/osmo-stp.cfg</span><br><span>+++ b/ttcn3-stp-test/osmo-stp.cfg</span><br><span>@@ -26,16 +26,24 @@</span><br><span> !</span><br><span> asp asp-sender 9999 2905 m3ua</span><br><span> local-ip 172.18.19.200</span><br><span style="color: hsl(120, 100%, 40%);">+ local-ip fd02:db8:19::200</span><br><span> remote-ip 172.18.19.203</span><br><span style="color: hsl(120, 100%, 40%);">+ remote-ip fd02:db8:19::203</span><br><span> asp asp-receiver0 10000 2905 m3ua</span><br><span> local-ip 172.18.19.200</span><br><span style="color: hsl(120, 100%, 40%);">+ local-ip fd02:db8:19::200</span><br><span> remote-ip 172.18.19.203</span><br><span style="color: hsl(120, 100%, 40%);">+ remote-ip fd02:db8:19::203</span><br><span> asp asp-receiver1 10001 2905 m3ua</span><br><span> local-ip 172.18.19.200</span><br><span style="color: hsl(120, 100%, 40%);">+ local-ip fd02:db8:19::200</span><br><span> remote-ip 172.18.19.203</span><br><span style="color: hsl(120, 100%, 40%);">+ remote-ip fd02:db8:19::203</span><br><span> asp asp-client0 10002 2906 m3ua</span><br><span> local-ip 172.18.19.200</span><br><span style="color: hsl(120, 100%, 40%);">+ local-ip fd02:db8:19::200</span><br><span> remote-ip 172.18.19.203</span><br><span style="color: hsl(120, 100%, 40%);">+ remote-ip fd02:db8:19::203</span><br><span> sctp-role client</span><br><span> role asp</span><br><span> as as-sender m3ua</span><br><span>@@ -109,6 +117,8 @@</span><br><span> !SERVERS:</span><br><span> !</span><br><span> listen m3ua 2905</span><br><span style="color: hsl(120, 100%, 40%);">+ local-ip 172.18.19.200</span><br><span style="color: hsl(120, 100%, 40%);">+ local-ip fd02:db8:19::200</span><br><span> accept-asp-connections dynamic-permitted</span><br><span> listen ipa 5000</span><br><span> accept-asp-connections dynamic-permitted</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/19771">change 19771</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/docker-playground/+/19771"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: docker-playground </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Id6e197cc3ba71e36f29ceec44742b7452a47b36b </div>
<div style="display:none"> Gerrit-Change-Number: 19771 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>