ttcn3-*: Update test setup after Osmocom CNI release 202302
Change-Id: If34b043a55177e6c0d1be3949fc2a2682258cc84
This commit is contained in:
parent
4a2d9d1c0c
commit
666488c8e4
|
@ -45,11 +45,7 @@ docker run --rm \
|
||||||
$DOCKER_ARGS \
|
$DOCKER_ARGS \
|
||||||
$REPO_USER/osmo-bsc-$IMAGE_SUFFIX
|
$REPO_USER/osmo-bsc-$IMAGE_SUFFIX
|
||||||
|
|
||||||
BTS_FEATURES="-fCCN,EGPRS,GPRS,IPv6_NSVC,PAGING_COORDINATION,VAMOS"
|
BTS_FEATURES="-fCCN,EGPRS,GPRS,IPv6_NSVC,PAGING_COORDINATION,VAMOS,OSMUX"
|
||||||
# Disable until libosmocore release > 1.7.0
|
|
||||||
if image_suffix_is_master; then
|
|
||||||
BTS_FEATURES="${BTS_FEATURES},OSMUX"
|
|
||||||
fi
|
|
||||||
|
|
||||||
for i in `seq 0 2`; do
|
for i in `seq 0 2`; do
|
||||||
echo Starting container with OML for BTS$i
|
echo Starting container with OML for BTS$i
|
||||||
|
|
|
@ -31,12 +31,7 @@ docker run --rm \
|
||||||
$DOCKER_ARGS \
|
$DOCKER_ARGS \
|
||||||
$REPO_USER/osmo-bsc-$IMAGE_SUFFIX
|
$REPO_USER/osmo-bsc-$IMAGE_SUFFIX
|
||||||
|
|
||||||
BTS_FEATURES="-fCCN,EGPRS,GPRS,IPv6_NSVC,PAGING_COORDINATION"
|
BTS_FEATURES="-fCCN,EGPRS,GPRS,IPv6_NSVC,PAGING_COORDINATION,OSMUX"
|
||||||
# Disable until libosmocore release > 1.7.0
|
|
||||||
if image_suffix_is_master; then
|
|
||||||
BTS_FEATURES="${BTS_FEATURES},OSMUX"
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
for i in "0 1" "1 1" "2 4"; do
|
for i in "0 1" "1 1" "2 4"; do
|
||||||
set -- $i # convert the {BTS, TRXN} "tuple" into the param args $1 $2
|
set -- $i # convert the {BTS, TRXN} "tuple" into the param args $1 $2
|
||||||
|
|
|
@ -44,11 +44,7 @@ docker run --rm \
|
||||||
$DOCKER_ARGS \
|
$DOCKER_ARGS \
|
||||||
$REPO_USER/osmo-bsc-$IMAGE_SUFFIX
|
$REPO_USER/osmo-bsc-$IMAGE_SUFFIX
|
||||||
|
|
||||||
BTS_FEATURES="-fCCN,EGPRS,GPRS,IPv6_NSVC,PAGING_COORDINATION"
|
BTS_FEATURES="-fCCN,EGPRS,GPRS,IPv6_NSVC,PAGING_COORDINATION,OSMUX"
|
||||||
# Disable until libosmocore release > 1.7.0
|
|
||||||
if image_suffix_is_master; then
|
|
||||||
BTS_FEATURES="${BTS_FEATURES},OSMUX"
|
|
||||||
fi
|
|
||||||
|
|
||||||
for i in "0 1" "1 1" "2 4"; do
|
for i in "0 1" "1 1" "2 4"; do
|
||||||
set -- $i # convert the {BTS, TRXN} "tuple" into the param args $1 $2
|
set -- $i # convert the {BTS, TRXN} "tuple" into the param args $1 $2
|
||||||
|
|
|
@ -150,11 +150,6 @@ cp generic/osmo-bsc.gen.cfg $VOL_BASE_DIR/bsc/
|
||||||
mkdir $VOL_BASE_DIR/bts
|
mkdir $VOL_BASE_DIR/bts
|
||||||
mkdir $VOL_BASE_DIR/bts/unix
|
mkdir $VOL_BASE_DIR/bts/unix
|
||||||
cp generic/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/
|
cp generic/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/
|
||||||
# Disable until osmo-bts release > 1.5.0
|
|
||||||
if ! image_suffix_is_master; then
|
|
||||||
sed -i "/^ logging level osmux info/d" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg
|
|
||||||
sed -i "/^ osmux/{N;N;N;N;d;}" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg
|
|
||||||
fi
|
|
||||||
|
|
||||||
mkdir $VOL_BASE_DIR/unix
|
mkdir $VOL_BASE_DIR/unix
|
||||||
|
|
||||||
|
@ -177,11 +172,6 @@ docker container kill ${BUILD_TAG}-trxcon
|
||||||
docker container kill ${BUILD_TAG}-fake_trx
|
docker container kill ${BUILD_TAG}-fake_trx
|
||||||
docker container kill ${BUILD_TAG}-bts
|
docker container kill ${BUILD_TAG}-bts
|
||||||
cp virtphy/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/
|
cp virtphy/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/
|
||||||
# Disable until osmo-bts release > 1.5.0
|
|
||||||
if ! image_suffix_is_master; then
|
|
||||||
sed -i "/^ logging level osmux info/d" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg
|
|
||||||
sed -i "/^ osmux/{N;N;N;N;d;}" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg
|
|
||||||
fi
|
|
||||||
network_replace_subnet_in_configs
|
network_replace_subnet_in_configs
|
||||||
start_bts virtual 0
|
start_bts virtual 0
|
||||||
start_virtphy
|
start_virtphy
|
||||||
|
@ -195,11 +185,6 @@ docker container kill ${BUILD_TAG}-virtphy
|
||||||
docker container kill ${BUILD_TAG}-bts
|
docker container kill ${BUILD_TAG}-bts
|
||||||
|
|
||||||
cp oml/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/
|
cp oml/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/
|
||||||
# Disable until osmo-bts release > 1.5.0
|
|
||||||
if ! image_suffix_is_master; then
|
|
||||||
sed -i "/^ logging level osmux info/d" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg
|
|
||||||
sed -i "/^ osmux/{N;N;N;N;d;}" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg
|
|
||||||
fi
|
|
||||||
network_replace_subnet_in_configs
|
network_replace_subnet_in_configs
|
||||||
start_bts trx 1
|
start_bts trx 1
|
||||||
start_fake_trx
|
start_fake_trx
|
||||||
|
@ -210,11 +195,6 @@ start_testsuite oml
|
||||||
# 4) Frequency hopping tests require different configuration files
|
# 4) Frequency hopping tests require different configuration files
|
||||||
cp fh/osmo-bsc.gen.cfg $VOL_BASE_DIR/bsc/
|
cp fh/osmo-bsc.gen.cfg $VOL_BASE_DIR/bsc/
|
||||||
cp generic/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/
|
cp generic/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/
|
||||||
# Disable until osmo-bts release > 1.5.0
|
|
||||||
if ! image_suffix_is_master; then
|
|
||||||
sed -i "/^ logging level osmux info/d" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg
|
|
||||||
sed -i "/^ osmux/{N;N;N;N;d;}" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg
|
|
||||||
fi
|
|
||||||
# restart the BSC/BTS and run the testsuite again
|
# restart the BSC/BTS and run the testsuite again
|
||||||
docker container kill ${BUILD_TAG}-bts
|
docker container kill ${BUILD_TAG}-bts
|
||||||
network_replace_subnet_in_configs
|
network_replace_subnet_in_configs
|
||||||
|
|
|
@ -81,9 +81,6 @@ run_tests() {
|
||||||
echo Testing without PFCP
|
echo Testing without PFCP
|
||||||
run_tests "$VOL_BASE_DIR" "HNBGW_Tests.cfg" "osmo-stp.cfg" "osmo-hnbgw.cfg"
|
run_tests "$VOL_BASE_DIR" "HNBGW_Tests.cfg" "osmo-stp.cfg" "osmo-hnbgw.cfg"
|
||||||
|
|
||||||
# Disable until osmo-hnbgw release >1.3.0
|
echo Testing with PFCP
|
||||||
if image_suffix_is_master; then
|
mkdir "$VOL_BASE_DIR_PFCP"
|
||||||
echo Testing with PFCP
|
run_tests "$VOL_BASE_DIR_PFCP" "with-pfcp/HNBGW_Tests.cfg" "osmo-stp.cfg" "with-pfcp/osmo-hnbgw.cfg"
|
||||||
mkdir "$VOL_BASE_DIR_PFCP"
|
|
||||||
run_tests "$VOL_BASE_DIR_PFCP" "with-pfcp/HNBGW_Tests.cfg" "osmo-stp.cfg" "with-pfcp/osmo-hnbgw.cfg"
|
|
||||||
fi
|
|
||||||
|
|
|
@ -15,10 +15,6 @@ write_mp_osmo_repo "$VOL_BASE_DIR/mgw-tester/MGCP_Test.cfg"
|
||||||
|
|
||||||
mkdir $VOL_BASE_DIR/mgw
|
mkdir $VOL_BASE_DIR/mgw
|
||||||
cp osmo-mgw.cfg $VOL_BASE_DIR/mgw/
|
cp osmo-mgw.cfg $VOL_BASE_DIR/mgw/
|
||||||
# Can be dropped once released osmo-mgw is >1.10.0:
|
|
||||||
if ! image_suffix_is_master; then
|
|
||||||
sed -i "/^ osmux bind-ip-v6 fd02:db8:4::180/d" $VOL_BASE_DIR/mgw/osmo-mgw.cfg
|
|
||||||
fi
|
|
||||||
|
|
||||||
network_create
|
network_create
|
||||||
network_replace_subnet_in_configs
|
network_replace_subnet_in_configs
|
||||||
|
|
Loading…
Reference in New Issue