<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/19656">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">migrate ttcn3-msc-test from 172.18.1.0/24 to 172.18.20.0/24<br><br>When introducing IPv6 support, we map the third digit of the IPv4<br>address (X) to the 6th byte of an IPv6 prefix "fd02:db8:X::/64"<br><br>However, the docker daemon seems to use "fd02:db8:1::/64" internally<br>for its default network, so creating a docker network with the same<br>IP address is failing.<br><br>Let's move the MSC test suite to another sub-net (1->20) to avoid<br>related problems.<br><br>Change-Id: I9c5f9b96d5523eae09f3f2e6c813e9e0d047f9ab<br>---<br>M ttcn3-msc-test/MSC_Tests.cfg<br>M ttcn3-msc-test/Makefile<br>M ttcn3-msc-test/jenkins.sh<br>M ttcn3-msc-test/osmo-msc.cfg<br>M ttcn3-msc-test/osmo-stp.cfg<br>5 files changed, 23 insertions(+), 23 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/56/19656/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ttcn3-msc-test/MSC_Tests.cfg b/ttcn3-msc-test/MSC_Tests.cfg</span><br><span>index 55e739c..092e4cf 100644</span><br><span>--- a/ttcn3-msc-test/MSC_Tests.cfg</span><br><span>+++ b/ttcn3-msc-test/MSC_Tests.cfg</span><br><span>@@ -5,7 +5,7 @@</span><br><span> [LOGGING]</span><br><span> </span><br><span> [TESTPORT_PARAMETERS]</span><br><span style="color: hsl(0, 100%, 40%);">-*.MSCVTY.CTRL_HOSTNAME := "172.18.1.10"</span><br><span style="color: hsl(120, 100%, 40%);">+*.MSCVTY.CTRL_HOSTNAME := "172.18.20.10"</span><br><span> </span><br><span> [MODULE_PARAMETERS]</span><br><span> # connection to STP</span><br><span>@@ -13,7 +13,7 @@</span><br><span>    {</span><br><span>            transport := BSSAP_TRANSPORT_AoIP,</span><br><span>           sccp_service_type := "mtp3_itu",</span><br><span style="color: hsl(0, 100%, 40%);">-              sctp_addr := { 23906, "172.18.1.103", 2905, "172.18.1.200" },</span><br><span style="color: hsl(120, 100%, 40%);">+             sctp_addr := { 23906, "172.18.20.103", 2905, "172.18.20.200" },</span><br><span>          own_pc := 193,  /* 0.24.1 BSC emulation [0] */</span><br><span>               own_ssn := 254,</span><br><span>              peer_pc := 185, /* 0.23.1 osmo-msc */</span><br><span>@@ -24,7 +24,7 @@</span><br><span>    {</span><br><span>            transport := BSSAP_TRANSPORT_AoIP,</span><br><span>           sccp_service_type := "mtp3_itu",</span><br><span style="color: hsl(0, 100%, 40%);">-              sctp_addr := { 23907, "172.18.1.103", 2905, "172.18.1.200" },</span><br><span style="color: hsl(120, 100%, 40%);">+             sctp_addr := { 23907, "172.18.20.103", 2905, "172.18.20.200" },</span><br><span>          own_pc := 194,  /* 0.24.2 BSC emulation [1] */</span><br><span>               own_ssn := 254,</span><br><span>              peer_pc := 185, /* 0.23.1 osmo-msc */</span><br><span>@@ -35,7 +35,7 @@</span><br><span>    {</span><br><span>            transport := RANAP_TRANSPORT_IuCS,</span><br><span>           sccp_service_type := "mtp3_itu",</span><br><span style="color: hsl(0, 100%, 40%);">-              sctp_addr := { 23908, "172.18.1.103", 2905, "172.18.1.200" },</span><br><span style="color: hsl(120, 100%, 40%);">+             sctp_addr := { 23908, "172.18.20.103", 2905, "172.18.20.200" },</span><br><span>          own_pc := 195,  /* 0.24.3 BSC emulation [2] */</span><br><span>               own_ssn := 142,</span><br><span>              peer_pc := 185, /* 0.23.1 osmo-msc */</span><br><span>@@ -47,10 +47,10 @@</span><br><span> </span><br><span> # remote (IUT) side</span><br><span> MSC_Tests.mp_msc_mncc := "/data/unix/mncc";</span><br><span style="color: hsl(0, 100%, 40%);">-MSC_Tests.mp_msc_ip := "172.18.1.10";</span><br><span style="color: hsl(120, 100%, 40%);">+MSC_Tests.mp_msc_ip := "172.18.20.10";</span><br><span> # local (emulation) side)</span><br><span style="color: hsl(0, 100%, 40%);">-MSC_Tests.mp_hlr_ip := "172.18.1.103";</span><br><span style="color: hsl(0, 100%, 40%);">-MSC_Tests.mp_mgw_ip := "172.18.1.103";</span><br><span style="color: hsl(120, 100%, 40%);">+MSC_Tests.mp_hlr_ip := "172.18.20.103";</span><br><span style="color: hsl(120, 100%, 40%);">+MSC_Tests.mp_mgw_ip := "172.18.20.103";</span><br><span> MSC_Tests.mp_enable_osmux_test := true;</span><br><span> MSC_Tests.mp_enable_cell_id_test := true;</span><br><span> </span><br><span>diff --git a/ttcn3-msc-test/Makefile b/ttcn3-msc-test/Makefile</span><br><span>index fe1be7c..7f46da4 100644</span><br><span>--- a/ttcn3-msc-test/Makefile</span><br><span>+++ b/ttcn3-msc-test/Makefile</span><br><span>@@ -1,3 +1,3 @@</span><br><span style="color: hsl(0, 100%, 40%);">-RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.1.202 -v ggsn-test-vol:/data</span><br><span style="color: hsl(120, 100%, 40%);">+RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.20.202 -v ggsn-test-vol:/data</span><br><span> </span><br><span> include ../make/Makefile</span><br><span>diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh</span><br><span>index 9f5e0bf..bbdc739 100755</span><br><span>--- a/ttcn3-msc-test/jenkins.sh</span><br><span>+++ b/ttcn3-msc-test/jenkins.sh</span><br><span>@@ -7,7 +7,7 @@</span><br><span>       "osmo-msc-$IMAGE_SUFFIX" \</span><br><span>         "ttcn3-msc-test"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-network_create 1</span><br><span style="color: hsl(120, 100%, 40%);">+network_create 20</span><br><span> </span><br><span> mkdir $VOL_BASE_DIR/msc-tester</span><br><span> mkdir $VOL_BASE_DIR/msc-tester/unix</span><br><span>@@ -30,7 +30,7 @@</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.1.200 \</span><br><span style="color: hsl(120, 100%, 40%);">+               --network $NET_NAME --ip 172.18.20.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>@@ -38,7 +38,7 @@</span><br><span> </span><br><span> echo Starting container with MSC</span><br><span> docker run  --rm \</span><br><span style="color: hsl(0, 100%, 40%);">-          --network $NET_NAME --ip 172.18.1.10 \</span><br><span style="color: hsl(120, 100%, 40%);">+                --network $NET_NAME --ip 172.18.20.10 \</span><br><span>              --ulimit core=-1 \</span><br><span>           -v $VOL_BASE_DIR/msc:/data \</span><br><span>                 -v $VOL_BASE_DIR/unix:/data/unix \</span><br><span>@@ -49,7 +49,7 @@</span><br><span> </span><br><span> echo Starting container with MSC testsuite</span><br><span> docker run  --rm \</span><br><span style="color: hsl(0, 100%, 40%);">-          --network $NET_NAME --ip 172.18.1.103 \</span><br><span style="color: hsl(120, 100%, 40%);">+               --network $NET_NAME --ip 172.18.20.103 \</span><br><span>             --ulimit core=-1 \</span><br><span>           -e "TTCN3_PCAP_PATH=/data" \</span><br><span>               -v $VOL_BASE_DIR/msc-tester:/data \</span><br><span>diff --git a/ttcn3-msc-test/osmo-msc.cfg b/ttcn3-msc-test/osmo-msc.cfg</span><br><span>index a713786..6007e25 100644</span><br><span>--- a/ttcn3-msc-test/osmo-msc.cfg</span><br><span>+++ b/ttcn3-msc-test/osmo-msc.cfg</span><br><span>@@ -2,7 +2,7 @@</span><br><span> ! OsmoMSC (1.1.2.66-629c4-dirty) configuration saved from vty</span><br><span> !!</span><br><span> !</span><br><span style="color: hsl(0, 100%, 40%);">-log gsmtap 172.18.1.103</span><br><span style="color: hsl(120, 100%, 40%);">+log gsmtap 172.18.20.103</span><br><span>  logging level set-all debug</span><br><span>  logging filter all 1</span><br><span> !</span><br><span>@@ -58,7 +58,7 @@</span><br><span> cs7 instance 0</span><br><span>  point-code 0.23.1</span><br><span>  asp asp-clnt-OsmoMSC-A 2905 0 m3ua</span><br><span style="color: hsl(0, 100%, 40%);">-  remote-ip 172.18.1.200</span><br><span style="color: hsl(120, 100%, 40%);">+  remote-ip 172.18.20.200</span><br><span>  as as-clnt-OsmoMSC-A m3ua</span><br><span>   asp asp-clnt-OsmoMSC-A</span><br><span>   routing-key 3 0.23.1</span><br><span>@@ -76,7 +76,7 @@</span><br><span>  assign-tmsi</span><br><span>  cs7-instance-a 0</span><br><span>  cs7-instance-iu 0</span><br><span style="color: hsl(0, 100%, 40%);">- mgw remote-ip 172.18.1.103</span><br><span style="color: hsl(120, 100%, 40%);">+ mgw remote-ip 172.18.20.103</span><br><span>  emergency-call route-to-msisdn 112</span><br><span>  mncc external /data/unix/mncc</span><br><span> mncc-int</span><br><span>@@ -89,5 +89,5 @@</span><br><span>  esme msc_tester</span><br><span>   password osmocom1</span><br><span> hlr</span><br><span style="color: hsl(0, 100%, 40%);">- remote-ip 172.18.1.103</span><br><span style="color: hsl(120, 100%, 40%);">+ remote-ip 172.18.20.103</span><br><span>  remote-port 4222</span><br><span>diff --git a/ttcn3-msc-test/osmo-stp.cfg b/ttcn3-msc-test/osmo-stp.cfg</span><br><span>index 6d081fd..d13e4a7 100644</span><br><span>--- a/ttcn3-msc-test/osmo-stp.cfg</span><br><span>+++ b/ttcn3-msc-test/osmo-stp.cfg</span><br><span>@@ -2,7 +2,7 @@</span><br><span> ! OsmoSTP (0.8.1) configuration saved from vty</span><br><span> !!</span><br><span> !</span><br><span style="color: hsl(0, 100%, 40%);">-log gsmtap 172.18.1.103</span><br><span style="color: hsl(120, 100%, 40%);">+log gsmtap 172.18.20.103</span><br><span>  logging level set-all debug</span><br><span>  logging filter all 1</span><br><span> !</span><br><span>@@ -37,20 +37,20 @@</span><br><span> cs7 instance 0</span><br><span>  xua rkm routing-key-allocation dynamic-permitted</span><br><span>  asp virt-bsc0-0 23906 2905 m3ua</span><br><span style="color: hsl(0, 100%, 40%);">-  local-ip 172.18.1.200</span><br><span style="color: hsl(0, 100%, 40%);">-  remote-ip 172.18.1.103</span><br><span style="color: hsl(120, 100%, 40%);">+  local-ip 172.18.20.200</span><br><span style="color: hsl(120, 100%, 40%);">+  remote-ip 172.18.20.103</span><br><span>  as virt-bsc0 m3ua</span><br><span>   asp virt-bsc0-0</span><br><span>   routing-key 0 0.24.1</span><br><span>  asp virt-bsc1-0 23907 2905 m3ua</span><br><span style="color: hsl(0, 100%, 40%);">-  local-ip 172.18.1.200</span><br><span style="color: hsl(0, 100%, 40%);">-  remote-ip 172.18.1.103</span><br><span style="color: hsl(120, 100%, 40%);">+  local-ip 172.18.20.200</span><br><span style="color: hsl(120, 100%, 40%);">+  remote-ip 172.18.20.103</span><br><span>  as virt-bsc1 m3ua</span><br><span>   asp virt-bsc1-0</span><br><span>   routing-key 1 0.24.2</span><br><span>  asp virt-rnc0-0 23908 2905 m3ua</span><br><span style="color: hsl(0, 100%, 40%);">-  local-ip 172.18.1.200</span><br><span style="color: hsl(0, 100%, 40%);">-  remote-ip 172.18.1.103</span><br><span style="color: hsl(120, 100%, 40%);">+  local-ip 172.18.20.200</span><br><span style="color: hsl(120, 100%, 40%);">+  remote-ip 172.18.20.103</span><br><span>  as virt-rnc0 m3ua</span><br><span>   asp virt-rnc0-0</span><br><span>   routing-key 2 0.24.3</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/19656">change 19656</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/+/19656"/><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: I9c5f9b96d5523eae09f3f2e6c813e9e0d047f9ab </div>
<div style="display:none"> Gerrit-Change-Number: 19656 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>