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
This commit is contained in:
parent
68ddce97e3
commit
873f496d2b
|
@ -5,7 +5,7 @@
|
||||||
[LOGGING]
|
[LOGGING]
|
||||||
|
|
||||||
[TESTPORT_PARAMETERS]
|
[TESTPORT_PARAMETERS]
|
||||||
*.MSCVTY.CTRL_HOSTNAME := "172.18.1.10"
|
*.MSCVTY.CTRL_HOSTNAME := "172.18.20.10"
|
||||||
|
|
||||||
[MODULE_PARAMETERS]
|
[MODULE_PARAMETERS]
|
||||||
# connection to STP
|
# connection to STP
|
||||||
|
@ -13,7 +13,7 @@ MSC_Tests.mp_bssap_cfg := {
|
||||||
{
|
{
|
||||||
transport := BSSAP_TRANSPORT_AoIP,
|
transport := BSSAP_TRANSPORT_AoIP,
|
||||||
sccp_service_type := "mtp3_itu",
|
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_pc := 193, /* 0.24.1 BSC emulation [0] */
|
||||||
own_ssn := 254,
|
own_ssn := 254,
|
||||||
peer_pc := 185, /* 0.23.1 osmo-msc */
|
peer_pc := 185, /* 0.23.1 osmo-msc */
|
||||||
|
@ -24,7 +24,7 @@ MSC_Tests.mp_bssap_cfg := {
|
||||||
{
|
{
|
||||||
transport := BSSAP_TRANSPORT_AoIP,
|
transport := BSSAP_TRANSPORT_AoIP,
|
||||||
sccp_service_type := "mtp3_itu",
|
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_pc := 194, /* 0.24.2 BSC emulation [1] */
|
||||||
own_ssn := 254,
|
own_ssn := 254,
|
||||||
peer_pc := 185, /* 0.23.1 osmo-msc */
|
peer_pc := 185, /* 0.23.1 osmo-msc */
|
||||||
|
@ -35,7 +35,7 @@ MSC_Tests.mp_bssap_cfg := {
|
||||||
{
|
{
|
||||||
transport := RANAP_TRANSPORT_IuCS,
|
transport := RANAP_TRANSPORT_IuCS,
|
||||||
sccp_service_type := "mtp3_itu",
|
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_pc := 195, /* 0.24.3 BSC emulation [2] */
|
||||||
own_ssn := 142,
|
own_ssn := 142,
|
||||||
peer_pc := 185, /* 0.23.1 osmo-msc */
|
peer_pc := 185, /* 0.23.1 osmo-msc */
|
||||||
|
@ -47,10 +47,10 @@ MSC_Tests.mp_bssap_cfg := {
|
||||||
|
|
||||||
# remote (IUT) side
|
# remote (IUT) side
|
||||||
MSC_Tests.mp_msc_mncc := "/data/unix/mncc";
|
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)
|
# local (emulation) side)
|
||||||
MSC_Tests.mp_hlr_ip := "172.18.1.103";
|
MSC_Tests.mp_hlr_ip := "172.18.20.103";
|
||||||
MSC_Tests.mp_mgw_ip := "172.18.1.103";
|
MSC_Tests.mp_mgw_ip := "172.18.20.103";
|
||||||
MSC_Tests.mp_enable_osmux_test := true;
|
MSC_Tests.mp_enable_osmux_test := true;
|
||||||
MSC_Tests.mp_enable_cell_id_test := true;
|
MSC_Tests.mp_enable_cell_id_test := true;
|
||||||
|
|
||||||
|
|
|
@ -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
|
include ../make/Makefile
|
||||||
|
|
|
@ -7,7 +7,7 @@ docker_images_require \
|
||||||
"osmo-msc-$IMAGE_SUFFIX" \
|
"osmo-msc-$IMAGE_SUFFIX" \
|
||||||
"ttcn3-msc-test"
|
"ttcn3-msc-test"
|
||||||
|
|
||||||
network_create 1
|
network_create 20
|
||||||
|
|
||||||
mkdir $VOL_BASE_DIR/msc-tester
|
mkdir $VOL_BASE_DIR/msc-tester
|
||||||
mkdir $VOL_BASE_DIR/msc-tester/unix
|
mkdir $VOL_BASE_DIR/msc-tester/unix
|
||||||
|
@ -30,7 +30,7 @@ mkdir $VOL_BASE_DIR/unix
|
||||||
|
|
||||||
echo Starting container with STP
|
echo Starting container with STP
|
||||||
docker run --rm \
|
docker run --rm \
|
||||||
--network $NET_NAME --ip 172.18.1.200 \
|
--network $NET_NAME --ip 172.18.20.200 \
|
||||||
--ulimit core=-1 \
|
--ulimit core=-1 \
|
||||||
-v $VOL_BASE_DIR/stp:/data \
|
-v $VOL_BASE_DIR/stp:/data \
|
||||||
--name ${BUILD_TAG}-stp -d \
|
--name ${BUILD_TAG}-stp -d \
|
||||||
|
@ -38,7 +38,7 @@ docker run --rm \
|
||||||
|
|
||||||
echo Starting container with MSC
|
echo Starting container with MSC
|
||||||
docker run --rm \
|
docker run --rm \
|
||||||
--network $NET_NAME --ip 172.18.1.10 \
|
--network $NET_NAME --ip 172.18.20.10 \
|
||||||
--ulimit core=-1 \
|
--ulimit core=-1 \
|
||||||
-v $VOL_BASE_DIR/msc:/data \
|
-v $VOL_BASE_DIR/msc:/data \
|
||||||
-v $VOL_BASE_DIR/unix:/data/unix \
|
-v $VOL_BASE_DIR/unix:/data/unix \
|
||||||
|
@ -49,7 +49,7 @@ docker run --rm \
|
||||||
|
|
||||||
echo Starting container with MSC testsuite
|
echo Starting container with MSC testsuite
|
||||||
docker run --rm \
|
docker run --rm \
|
||||||
--network $NET_NAME --ip 172.18.1.103 \
|
--network $NET_NAME --ip 172.18.20.103 \
|
||||||
--ulimit core=-1 \
|
--ulimit core=-1 \
|
||||||
-e "TTCN3_PCAP_PATH=/data" \
|
-e "TTCN3_PCAP_PATH=/data" \
|
||||||
-v $VOL_BASE_DIR/msc-tester:/data \
|
-v $VOL_BASE_DIR/msc-tester:/data \
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
! OsmoMSC (1.1.2.66-629c4-dirty) configuration saved from vty
|
! OsmoMSC (1.1.2.66-629c4-dirty) configuration saved from vty
|
||||||
!!
|
!!
|
||||||
!
|
!
|
||||||
log gsmtap 172.18.1.103
|
log gsmtap 172.18.20.103
|
||||||
logging level set-all debug
|
logging level set-all debug
|
||||||
logging filter all 1
|
logging filter all 1
|
||||||
!
|
!
|
||||||
|
@ -58,7 +58,7 @@ ctrl
|
||||||
cs7 instance 0
|
cs7 instance 0
|
||||||
point-code 0.23.1
|
point-code 0.23.1
|
||||||
asp asp-clnt-OsmoMSC-A 2905 0 m3ua
|
asp asp-clnt-OsmoMSC-A 2905 0 m3ua
|
||||||
remote-ip 172.18.1.200
|
remote-ip 172.18.20.200
|
||||||
as as-clnt-OsmoMSC-A m3ua
|
as as-clnt-OsmoMSC-A m3ua
|
||||||
asp asp-clnt-OsmoMSC-A
|
asp asp-clnt-OsmoMSC-A
|
||||||
routing-key 3 0.23.1
|
routing-key 3 0.23.1
|
||||||
|
@ -76,7 +76,7 @@ msc
|
||||||
assign-tmsi
|
assign-tmsi
|
||||||
cs7-instance-a 0
|
cs7-instance-a 0
|
||||||
cs7-instance-iu 0
|
cs7-instance-iu 0
|
||||||
mgw remote-ip 172.18.1.103
|
mgw remote-ip 172.18.20.103
|
||||||
emergency-call route-to-msisdn 112
|
emergency-call route-to-msisdn 112
|
||||||
mncc external /data/unix/mncc
|
mncc external /data/unix/mncc
|
||||||
mncc-int
|
mncc-int
|
||||||
|
@ -89,5 +89,5 @@ smpp
|
||||||
esme msc_tester
|
esme msc_tester
|
||||||
password osmocom1
|
password osmocom1
|
||||||
hlr
|
hlr
|
||||||
remote-ip 172.18.1.103
|
remote-ip 172.18.20.103
|
||||||
remote-port 4222
|
remote-port 4222
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
! OsmoSTP (0.8.1) configuration saved from vty
|
! OsmoSTP (0.8.1) configuration saved from vty
|
||||||
!!
|
!!
|
||||||
!
|
!
|
||||||
log gsmtap 172.18.1.103
|
log gsmtap 172.18.20.103
|
||||||
logging level set-all debug
|
logging level set-all debug
|
||||||
logging filter all 1
|
logging filter all 1
|
||||||
!
|
!
|
||||||
|
@ -37,20 +37,20 @@ line vty
|
||||||
cs7 instance 0
|
cs7 instance 0
|
||||||
xua rkm routing-key-allocation dynamic-permitted
|
xua rkm routing-key-allocation dynamic-permitted
|
||||||
asp virt-bsc0-0 23906 2905 m3ua
|
asp virt-bsc0-0 23906 2905 m3ua
|
||||||
local-ip 172.18.1.200
|
local-ip 172.18.20.200
|
||||||
remote-ip 172.18.1.103
|
remote-ip 172.18.20.103
|
||||||
as virt-bsc0 m3ua
|
as virt-bsc0 m3ua
|
||||||
asp virt-bsc0-0
|
asp virt-bsc0-0
|
||||||
routing-key 0 0.24.1
|
routing-key 0 0.24.1
|
||||||
asp virt-bsc1-0 23907 2905 m3ua
|
asp virt-bsc1-0 23907 2905 m3ua
|
||||||
local-ip 172.18.1.200
|
local-ip 172.18.20.200
|
||||||
remote-ip 172.18.1.103
|
remote-ip 172.18.20.103
|
||||||
as virt-bsc1 m3ua
|
as virt-bsc1 m3ua
|
||||||
asp virt-bsc1-0
|
asp virt-bsc1-0
|
||||||
routing-key 1 0.24.2
|
routing-key 1 0.24.2
|
||||||
asp virt-rnc0-0 23908 2905 m3ua
|
asp virt-rnc0-0 23908 2905 m3ua
|
||||||
local-ip 172.18.1.200
|
local-ip 172.18.20.200
|
||||||
remote-ip 172.18.1.103
|
remote-ip 172.18.20.103
|
||||||
as virt-rnc0 m3ua
|
as virt-rnc0 m3ua
|
||||||
asp virt-rnc0-0
|
asp virt-rnc0-0
|
||||||
routing-key 2 0.24.3
|
routing-key 2 0.24.3
|
||||||
|
|
Loading…
Reference in New Issue