Revert "ttcn3-bsc-test: enable A5/4 support in osmo-bsc.cfg"

The test that needs A5/4 enables it dynamically, and a new test requires
a defined value to reset to.
This reverts commit 8005014b55.

Related: OS#4975
Depends: osmo-ttcn3-hacks I3cf36c6ef86a0db050507f3737f4b0c10dcd52ed
Change-Id: I55135ca00ef51de5cf6eaec75cfc20c21beef665
This commit is contained in:
Oliver Smith 2021-07-09 14:05:59 +02:00
parent 8005014b55
commit 688cda1158
4 changed files with 2 additions and 14 deletions

View File

@ -19,12 +19,6 @@ cp sccplite/BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/
mkdir $VOL_BASE_DIR/bsc
cp sccplite/osmo-bsc.cfg $VOL_BASE_DIR/bsc/
# Exclude A5/4 for non-master versions of the IUT
if ! image_suffix_is_master; then
sed "s/encryption a5 0 1 3 4/encryption a5 0 1 3/" \
-i $VOL_BASE_DIR/bsc/osmo-bsc.cfg
fi
SUBNET=12
network_create $SUBNET

View File

@ -22,12 +22,6 @@ cp osmo-bsc.cfg $VOL_BASE_DIR/bsc/
mkdir $VOL_BASE_DIR/bts-omldummy
# Exclude A5/4 for non-master versions of the IUT
if ! image_suffix_is_master; then
sed "s/encryption a5 0 1 3 4/encryption a5 0 1 3/" \
-i $VOL_BASE_DIR/bsc/osmo-bsc.cfg
fi
SUBNET=2
network_create $SUBNET

View File

@ -75,7 +75,7 @@ cs7 instance 0
network
network country code 1
mobile network code 1
encryption a5 0 1 3 4
encryption a5 0 1 3
neci 1
paging any use tch 0
handover 1

View File

@ -64,7 +64,7 @@ cs7 instance 0
network
network country code 1
mobile network code 1
encryption a5 0 1 3 4
encryption a5 0 1 3
neci 1
paging any use tch 0
handover 1