From 2a9cf7a53a0697249d4eda3381515ab7f63da168 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Mon, 2 Mar 2020 17:25:05 +0100 Subject: osmo-gsm-tester: Improvements anv fixes to run 4G network with latest ogt version * Fix wrong KI. * Add an extra IP address to slave so that ENB and EPC can be run on different IP addresses and their GTP ports don't collide. * Add required rf parameters to resources.conf Change-Id: I0198bc99f75e9567ee717aa79e434ec28705fac9 --- osmo-gsm-tester/Dockerfile | 2 +- osmo-gsm-tester/jenkins.sh | 5 +++-- osmo-gsm-tester/osmo-gsm-tester-master.sh | 14 ++++++++++++++ osmo-gsm-tester/osmo-gsm-tester-slave.sh | 6 ++++++ osmo-gsm-tester/osmo-gsm-tester.sh | 14 -------------- osmo-gsm-tester/resources.conf | 6 ++++-- 6 files changed, 28 insertions(+), 19 deletions(-) create mode 100755 osmo-gsm-tester/osmo-gsm-tester-master.sh create mode 100755 osmo-gsm-tester/osmo-gsm-tester-slave.sh delete mode 100755 osmo-gsm-tester/osmo-gsm-tester.sh diff --git a/osmo-gsm-tester/Dockerfile b/osmo-gsm-tester/Dockerfile index 6ed992e..859f0b1 100644 --- a/osmo-gsm-tester/Dockerfile +++ b/osmo-gsm-tester/Dockerfile @@ -134,6 +134,6 @@ COPY resources.conf /tmp/osmo-gsm-tester/example/resources.conf ENV OSMO_GSM_TESTER_CONF /tmp/osmo-gsm-tester/example WORKDIR /data -CMD ["/bin/sh", "-c", "/data/osmo-gsm-tester.sh >/data/osmo-gsm-tester.log 2>&1"] +CMD ["/bin/sh", "-c", "/data/osmo-gsm-tester-master.sh >/data/osmo-gsm-tester.log 2>&1"] EXPOSE 22/tcp diff --git a/osmo-gsm-tester/jenkins.sh b/osmo-gsm-tester/jenkins.sh index 16552f9..248a10b 100755 --- a/osmo-gsm-tester/jenkins.sh +++ b/osmo-gsm-tester/jenkins.sh @@ -21,9 +21,10 @@ docker_images_require \ network_create 172.18.50.0/24 mkdir $VOL_BASE_DIR/ogt-slave +cp osmo-gsm-tester-slave.sh $VOL_BASE_DIR/ogt-slave/ mkdir $VOL_BASE_DIR/ogt-master -cp osmo-gsm-tester.sh $VOL_BASE_DIR/ogt-master/ +cp osmo-gsm-tester-master.sh $VOL_BASE_DIR/ogt-master/ echo Starting container with osmo-gsm-tester slave docker run --rm \ @@ -35,7 +36,7 @@ docker run --rm \ -v $VOL_BASE_DIR/ogt-slave:/data \ --name ${BUILD_TAG}-ogt-slave -d \ $REPO_USER/osmo-gsm-tester \ - /bin/sh -c "/usr/sbin/sshd -D -e >/data/sshd.log 2>&1" + /bin/sh -c "/data/osmo-gsm-tester-slave.sh >/data/sshd.log 2>&1" echo Starting container with osmo-gsm-tester main unit docker run --rm \ diff --git a/osmo-gsm-tester/osmo-gsm-tester-master.sh b/osmo-gsm-tester/osmo-gsm-tester-master.sh new file mode 100755 index 0000000..bfd303b --- /dev/null +++ b/osmo-gsm-tester/osmo-gsm-tester-master.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +# Add local IP addresses required by osmo-gsm-tester resources: +ip addr add 172.18.50.2/24 dev eth0 +ip addr add 172.18.50.3/24 dev eth0 +ip addr add 172.18.50.4/24 dev eth0 +ip addr add 172.18.50.5/24 dev eth0 +ip addr add 172.18.50.6/24 dev eth0 +ip addr add 172.18.50.7/24 dev eth0 +ip addr add 172.18.50.8/24 dev eth0 +ip addr add 172.18.50.9/24 dev eth0 +ip addr add 172.18.50.10/24 dev eth0 + +su -c "python3 -u /tmp/osmo-gsm-tester/src/osmo-gsm-tester.py /tmp/trial -T -l dbg -s 4g -t iperf3" -m jenkins diff --git a/osmo-gsm-tester/osmo-gsm-tester-slave.sh b/osmo-gsm-tester/osmo-gsm-tester-slave.sh new file mode 100755 index 0000000..3170922 --- /dev/null +++ b/osmo-gsm-tester/osmo-gsm-tester-slave.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +# Add local IP addresses required by osmo-gsm-tester resources: +ip addr add 172.18.50.101/24 dev eth0 + +/usr/sbin/sshd -D -e diff --git a/osmo-gsm-tester/osmo-gsm-tester.sh b/osmo-gsm-tester/osmo-gsm-tester.sh deleted file mode 100755 index bfd303b..0000000 --- a/osmo-gsm-tester/osmo-gsm-tester.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -# Add local IP addresses required by osmo-gsm-tester resources: -ip addr add 172.18.50.2/24 dev eth0 -ip addr add 172.18.50.3/24 dev eth0 -ip addr add 172.18.50.4/24 dev eth0 -ip addr add 172.18.50.5/24 dev eth0 -ip addr add 172.18.50.6/24 dev eth0 -ip addr add 172.18.50.7/24 dev eth0 -ip addr add 172.18.50.8/24 dev eth0 -ip addr add 172.18.50.9/24 dev eth0 -ip addr add 172.18.50.10/24 dev eth0 - -su -c "python3 -u /tmp/osmo-gsm-tester/src/osmo-gsm-tester.py /tmp/trial -T -l dbg -s 4g -t iperf3" -m jenkins diff --git a/osmo-gsm-tester/resources.conf b/osmo-gsm-tester/resources.conf index 1120178..a81d92a 100644 --- a/osmo-gsm-tester/resources.conf +++ b/osmo-gsm-tester/resources.conf @@ -36,8 +36,9 @@ bts: enb: - label: srsENB-zmq type: srsenb + rf_dev_type: zmq remote_user: jenkins - addr: 172.18.50.100 + addr: 172.18.50.101 arfcn: - arfcn: 512 @@ -53,8 +54,9 @@ modem: - label: srsUE-zmq_1 type: srsue + rf_dev_type: zmq remote_user: jenkins addr: 172.18.50.100 imsi: '001010123456789' - ki: '8CCBE85A62C6DC7AC2A9886F4BBC3146' + ki: '00112233445566778899aabbccddeeff' auth_algo: 'xor' -- cgit v1.2.3