Change in docker-playground[master]: migrate ttcn3-msc-test from 172.18.1.0/24 to 172.18.20.0/24
laforge has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/19656 )
Change subject: migrate ttcn3-msc-test from 172.18.1.0/24 to 172.18.20.0/24
..
migrate ttcn3-msc-test from 172.18.1.0/24 to 172.18.20.0/24
When introducing IPv6 support, we map the third digit of the IPv4
address (X) to the 6th byte of an IPv6 prefix "fd02:db8:X::/64"
However, the docker daemon seems to use "fd02:db8:1::/64" internally
for its default network, so creating a docker network with the same
IP address is failing.
Let's move the MSC test suite to another sub-net (1->20) to avoid
related problems.
Change-Id: I9c5f9b96d5523eae09f3f2e6c813e9e0d047f9ab
---
M ttcn3-msc-test/MSC_Tests.cfg
M ttcn3-msc-test/Makefile
M ttcn3-msc-test/jenkins.sh
M ttcn3-msc-test/osmo-msc.cfg
M ttcn3-msc-test/osmo-stp.cfg
5 files changed, 23 insertions(+), 23 deletions(-)
Approvals:
laforge: Looks good to me, approved; Verified
diff --git a/ttcn3-msc-test/MSC_Tests.cfg b/ttcn3-msc-test/MSC_Tests.cfg
index 55e739c..092e4cf 100644
--- a/ttcn3-msc-test/MSC_Tests.cfg
+++ b/ttcn3-msc-test/MSC_Tests.cfg
@@ -5,7 +5,7 @@
[LOGGING]
[TESTPORT_PARAMETERS]
-*.MSCVTY.CTRL_HOSTNAME := "172.18.1.10"
+*.MSCVTY.CTRL_HOSTNAME := "172.18.20.10"
[MODULE_PARAMETERS]
# connection to STP
@@ -13,7 +13,7 @@
{
transport := BSSAP_TRANSPORT_AoIP,
sccp_service_type := "mtp3_itu",
- sctp_addr := { 23906, "172.18.1.103", 2905, "172.18.1.200" },
+ sctp_addr := { 23906, "172.18.20.103", 2905, "172.18.20.200" },
own_pc := 193, /* 0.24.1 BSC emulation [0] */
own_ssn := 254,
peer_pc := 185, /* 0.23.1 osmo-msc */
@@ -24,7 +24,7 @@
{
transport := BSSAP_TRANSPORT_AoIP,
sccp_service_type := "mtp3_itu",
- sctp_addr := { 23907, "172.18.1.103", 2905, "172.18.1.200" },
+ sctp_addr := { 23907, "172.18.20.103", 2905, "172.18.20.200" },
own_pc := 194, /* 0.24.2 BSC emulation [1] */
own_ssn := 254,
peer_pc := 185, /* 0.23.1 osmo-msc */
@@ -35,7 +35,7 @@
{
transport := RANAP_TRANSPORT_IuCS,
sccp_service_type := "mtp3_itu",
- sctp_addr := { 23908, "172.18.1.103", 2905, "172.18.1.200" },
+ sctp_addr := { 23908, "172.18.20.103", 2905, "172.18.20.200" },
own_pc := 195, /* 0.24.3 BSC emulation [2] */
own_ssn := 142,
peer_pc := 185, /* 0.23.1 osmo-msc */
@@ -47,10 +47,10 @@
# remote (IUT) side
MSC_Tests.mp_msc_mncc := "/data/unix/mncc";
-MSC_Tests.mp_msc_ip := "172.18.1.10";
+MSC_Tests.mp_msc_ip := "172.18.20.10";
# local (emulation) side)
-MSC_Tests.mp_hlr_ip := "172.18.1.103";
-MSC_Tests.mp_mgw_ip := "172.18.1.103";
+MSC_Tests.mp_hlr_ip := "172.18.20.103";
+MSC_Tests.mp_mgw_ip := "172.18.20.103";
MSC_Tests.mp_enable_osmux_test := true;
MSC_Tests.mp_enable_cell_id_test := true;
diff --git a/ttcn3-msc-test/Makefile b/ttcn3-msc-test/Makefile
index fe1be7c..7f46da4 100644
--- a/ttcn3-msc-test/Makefile
+++ b/ttcn3-msc-test/Makefile
@@ -1,3 +1,3 @@
-RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran
--ip 172.18.1.202 -v ggsn-test-vol:/data
+RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran
--ip 172.18.20.202 -v ggsn-test-vol:/data
include ../make/Makefile
diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh
index 9f5e0bf..bbdc739 100755
--- a/ttcn3-msc-test/jenkins.sh
+++ b/ttcn3-msc-test/jenkins.sh
@@ -7,7 +7,7 @@
"osmo-msc-$IMAGE_SUFFIX" \
"ttcn3-msc-test"
-network_create 1
+network_create 20
mkdir $VOL_BASE_DIR/msc-tester
mkdir $VOL_BASE_DIR/msc-tester/unix
@@ -30,7 +30,7 @@
echo Starting container with STP
docker run --rm \
- --network $NET_NAME --ip 172.18.1.200 \
+ --network $NET_NAME --ip 172.18.20.200 \
--ulimit core=-1 \
-v $VOL_BASE_DIR/stp:/data \
--name ${BUILD_TAG}-stp -d \
@@ -38,7 +38,7 @@
echo Starting container with MSC
docker run --rm \
- --network $NET_NAME --ip 172.18.1.10 \
+ --network $NET_NAME --ip 172.18.20.10 \
--ulimit core=-1 \
-v $VOL_BASE_DIR/msc:/data \
-v $VOL_BASE_DIR/unix:/data/unix \
@@ -49,7 +49,7 @@
echo Starting container with MSC testsuite
docker run --rm \
- --network $NET_NAME --ip 172.18.1.103 \
+ --network $NET_NAME --ip 172.18.20.103 \
--ulimit core=-1 \
-e "TTCN3_PCAP_PATH=/data" \
-v $VOL_BASE_DIR/msc-tester:/data \
diff --git a/ttcn3-msc-test/osmo-msc.cfg b/ttcn3-msc-test/osmo-msc.cfg
index a713786..6007e25 100644
--- a/ttcn3-msc-test/osmo-msc.cfg
+++
Change in docker-playground[master]: migrate ttcn3-msc-test from 172.18.1.0/24 to 172.18.20.0/24
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19656 ) Change subject: migrate ttcn3-msc-test from 172.18.1.0/24 to 172.18.20.0/24 .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9c5f9b96d5523eae09f3f2e6c813e9e0d047f9ab Gerrit-Change-Number: 19656 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 14 Aug 2020 06:21:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: migrate ttcn3-msc-test from 172.18.1.0/24 to 172.18.20.0/24
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/19656 )
Change subject: migrate ttcn3-msc-test from 172.18.1.0/24 to 172.18.20.0/24
..
migrate ttcn3-msc-test from 172.18.1.0/24 to 172.18.20.0/24
When introducing IPv6 support, we map the third digit of the IPv4
address (X) to the 6th byte of an IPv6 prefix "fd02:db8:X::/64"
However, the docker daemon seems to use "fd02:db8:1::/64" internally
for its default network, so creating a docker network with the same
IP address is failing.
Let's move the MSC test suite to another sub-net (1->20) to avoid
related problems.
Change-Id: I9c5f9b96d5523eae09f3f2e6c813e9e0d047f9ab
---
M ttcn3-msc-test/MSC_Tests.cfg
M ttcn3-msc-test/Makefile
M ttcn3-msc-test/jenkins.sh
M ttcn3-msc-test/osmo-msc.cfg
M ttcn3-msc-test/osmo-stp.cfg
5 files changed, 23 insertions(+), 23 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/56/19656/1
diff --git a/ttcn3-msc-test/MSC_Tests.cfg b/ttcn3-msc-test/MSC_Tests.cfg
index 55e739c..092e4cf 100644
--- a/ttcn3-msc-test/MSC_Tests.cfg
+++ b/ttcn3-msc-test/MSC_Tests.cfg
@@ -5,7 +5,7 @@
[LOGGING]
[TESTPORT_PARAMETERS]
-*.MSCVTY.CTRL_HOSTNAME := "172.18.1.10"
+*.MSCVTY.CTRL_HOSTNAME := "172.18.20.10"
[MODULE_PARAMETERS]
# connection to STP
@@ -13,7 +13,7 @@
{
transport := BSSAP_TRANSPORT_AoIP,
sccp_service_type := "mtp3_itu",
- sctp_addr := { 23906, "172.18.1.103", 2905, "172.18.1.200" },
+ sctp_addr := { 23906, "172.18.20.103", 2905, "172.18.20.200" },
own_pc := 193, /* 0.24.1 BSC emulation [0] */
own_ssn := 254,
peer_pc := 185, /* 0.23.1 osmo-msc */
@@ -24,7 +24,7 @@
{
transport := BSSAP_TRANSPORT_AoIP,
sccp_service_type := "mtp3_itu",
- sctp_addr := { 23907, "172.18.1.103", 2905, "172.18.1.200" },
+ sctp_addr := { 23907, "172.18.20.103", 2905, "172.18.20.200" },
own_pc := 194, /* 0.24.2 BSC emulation [1] */
own_ssn := 254,
peer_pc := 185, /* 0.23.1 osmo-msc */
@@ -35,7 +35,7 @@
{
transport := RANAP_TRANSPORT_IuCS,
sccp_service_type := "mtp3_itu",
- sctp_addr := { 23908, "172.18.1.103", 2905, "172.18.1.200" },
+ sctp_addr := { 23908, "172.18.20.103", 2905, "172.18.20.200" },
own_pc := 195, /* 0.24.3 BSC emulation [2] */
own_ssn := 142,
peer_pc := 185, /* 0.23.1 osmo-msc */
@@ -47,10 +47,10 @@
# remote (IUT) side
MSC_Tests.mp_msc_mncc := "/data/unix/mncc";
-MSC_Tests.mp_msc_ip := "172.18.1.10";
+MSC_Tests.mp_msc_ip := "172.18.20.10";
# local (emulation) side)
-MSC_Tests.mp_hlr_ip := "172.18.1.103";
-MSC_Tests.mp_mgw_ip := "172.18.1.103";
+MSC_Tests.mp_hlr_ip := "172.18.20.103";
+MSC_Tests.mp_mgw_ip := "172.18.20.103";
MSC_Tests.mp_enable_osmux_test := true;
MSC_Tests.mp_enable_cell_id_test := true;
diff --git a/ttcn3-msc-test/Makefile b/ttcn3-msc-test/Makefile
index fe1be7c..7f46da4 100644
--- a/ttcn3-msc-test/Makefile
+++ b/ttcn3-msc-test/Makefile
@@ -1,3 +1,3 @@
-RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran
--ip 172.18.1.202 -v ggsn-test-vol:/data
+RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran
--ip 172.18.20.202 -v ggsn-test-vol:/data
include ../make/Makefile
diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh
index 9f5e0bf..bbdc739 100755
--- a/ttcn3-msc-test/jenkins.sh
+++ b/ttcn3-msc-test/jenkins.sh
@@ -7,7 +7,7 @@
"osmo-msc-$IMAGE_SUFFIX" \
"ttcn3-msc-test"
-network_create 1
+network_create 20
mkdir $VOL_BASE_DIR/msc-tester
mkdir $VOL_BASE_DIR/msc-tester/unix
@@ -30,7 +30,7 @@
echo Starting container with STP
docker run --rm \
- --network $NET_NAME --ip 172.18.1.200 \
+ --network $NET_NAME --ip 172.18.20.200 \
--ulimit core=-1 \
-v $VOL_BASE_DIR/stp:/data \
--name ${BUILD_TAG}-stp -d \
@@ -38,7 +38,7 @@
echo Starting container with MSC
docker run --rm \
- --network $NET_NAME --ip 172.18.1.10 \
+ --network $NET_NAME --ip 172.18.20.10 \
--ulimit core=-1 \
-v $VOL_BASE_DIR/msc:/data \
-v $VOL_BASE_DIR/unix:/data/unix \
@@ -49,7 +49,7 @@
echo Starting container with MSC testsuite
docker run --rm \
- --network $NET_NAME --ip 172.18.1.103 \
+ --network $NET_NAME --ip 172.18.20.103 \
--ulimit core=-1 \
-e "TTCN3_PCAP_PATH=/data" \
-v $VOL_BASE_DIR/msc-tester:/data \
diff --git a/ttcn3-msc-test/osmo-msc.cfg b/ttcn3-msc-test/osmo-msc.cfg
index a713786..6007e25 100644
---
