lynxis lazus has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/docker-playground/+/15155 )
Change subject: ttcn3-sgsn-master: add support for Iu
......................................................................
ttcn3-sgsn-master: add support for Iu
To support Iu tests, start osmo-stp when testing.
Depends-on: I66069e31c30d33934ad57cc2b8794f56ffd5c7d6 (osmo-ttcn3-hacks)
Change-Id: I4d6aef98832202652c5fe254105728430ba77119
---
M ttcn3-sgsn-test/SGSN_Tests.cfg
M ttcn3-sgsn-test/jenkins.sh
M ttcn3-sgsn-test/osmo-sgsn.cfg
A ttcn3-sgsn-test/osmo-stp.cfg
4 files changed, 74 insertions(+), 0 deletions(-)
Approvals:
pespin: Looks good to me, approved
lynxis lazus: Verified
diff --git a/ttcn3-sgsn-test/SGSN_Tests.cfg b/ttcn3-sgsn-test/SGSN_Tests.cfg
index 5ad5f7d..f7d6d9a 100644
--- a/ttcn3-sgsn-test/SGSN_Tests.cfg
+++ b/ttcn3-sgsn-test/SGSN_Tests.cfg
@@ -26,6 +26,11 @@
remote_ip := "172.18.8.10"
}
}
+SGSN_Tests.mp_ranap_cfg := {
+ {
+ sctp_addr := { 23908, "172.18.8.103", 2905, "172.18.8.200" }
+ }
+}
SGSN_Tests.mp_hlr_ip := "172.18.8.103"
SGSN_Tests.mp_ggsn_ip := "172.18.8.103"
@@ -34,3 +39,4 @@
[EXECUTE]
SGSN_Tests.control
+SGSN_Tests_Iu.control
diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh
index 9505624..621ad2e 100755
--- a/ttcn3-sgsn-test/jenkins.sh
+++ b/ttcn3-sgsn-test/jenkins.sh
@@ -4,6 +4,7 @@
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
docker_images_require \
"debian-stretch-build" \
+ "osmo-stp-$IMAGE_SUFFIX" \
"osmo-sgsn-$IMAGE_SUFFIX" \
"debian-stretch-titan" \
"ttcn3-sgsn-test"
@@ -16,8 +17,18 @@
mkdir $VOL_BASE_DIR/sgsn
cp osmo-sgsn.cfg $VOL_BASE_DIR/sgsn/
+mkdir $VOL_BASE_DIR/stp
+cp osmo-stp.cfg $VOL_BASE_DIR/stp/
+
mkdir $VOL_BASE_DIR/unix
+echo Starting container with STP
+docker run --rm \
+ --network $NET_NAME --ip 172.18.8.200 \
+ -v $VOL_BASE_DIR/stp:/data \
+ --name ${BUILD_TAG}-stp -d \
+ $REPO_USER/osmo-stp-$IMAGE_SUFFIX
+
echo Starting container with SGSN
docker run --rm \
--network $NET_NAME --ip 172.18.8.10 \
@@ -45,6 +56,7 @@
echo Stopping containers
docker container kill ${BUILD_TAG}-sgsn
+docker container kill ${BUILD_TAG}-stp
network_remove
collect_logs
diff --git a/ttcn3-sgsn-test/osmo-sgsn.cfg b/ttcn3-sgsn-test/osmo-sgsn.cfg
index 38b9945..0ca1a1d 100644
--- a/ttcn3-sgsn-test/osmo-sgsn.cfg
+++ b/ttcn3-sgsn-test/osmo-sgsn.cfg
@@ -52,6 +52,13 @@
ctrl
bind 0.0.0.0
!
+cs7 instance 0
+ point-code 0.23.4
+ asp asp-clnt-OsmoSGSN-A 2905 0 m3ua
+ remote-ip 172.18.8.200
+ as as-clnt-OsmoSGSN-A m3ua
+ asp asp-clnt-OsmoSGSN-A
+ routing-key 3 0.23.4
ns
timer tns-block 3
timer tns-block-retries 3
diff --git a/ttcn3-sgsn-test/osmo-stp.cfg b/ttcn3-sgsn-test/osmo-stp.cfg
new file mode 100644
index 0000000..1871358
--- /dev/null
+++ b/ttcn3-sgsn-test/osmo-stp.cfg
@@ -0,0 +1,49 @@
+!
+! OsmoSTP (0.8.1) configuration saved from vty
+!!
+!
+log gsmtap 172.18.1.103
+ logging level set-all debug
+!
+log file /data/osmo-stp.log
+ logging filter all 1
+ logging color 0
+ logging print category 1
+ logging timestamp 1
+ logging print extended-timestamp 1
+ logging level all everything
+ logging level lglobal notice
+ logging level llapd notice
+ logging level linp notice
+ logging level lmux notice
+ logging level lmi notice
+ logging level lmib notice
+ logging level lsms notice
+ logging level lctrl notice
+ logging level lgtp notice
+ logging level lstats notice
+ logging level lgsup notice
+ logging level loap notice
+ logging level lss7 debug
+ logging level lsccp debug
+ logging level lsua debug
+ logging level lm3ua debug
+ logging level lmgcp notice
+!
+line vty
+ no login
+!
+cs7 instance 0
+ xua rkm routing-key-allocation dynamic-permitted
+ asp virt-rnc0-0 23908 2905 m3ua
+ local-ip 172.18.8.200
+ remote-ip 172.18.8.103
+ as virt-rnc0 m3ua
+ asp virt-rnc0-0
+ routing-key 2 0.24.3
+ route-table system
+ update route 0.24.3 7.255.7 linkset virt-rnc0
+ listen m3ua 2905
+ accept-asp-connections dynamic-permitted
+ listen ipa 5000
+ accept-asp-connections dynamic-permitted
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15155
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I4d6aef98832202652c5fe254105728430ba77119
Gerrit-Change-Number: 15155
Gerrit-PatchSet: 3
Gerrit-Owner: lynxis lazus <lyn...@fe80.eu>
Gerrit-Reviewer: lynxis lazus <lyn...@fe80.eu>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-MessageType: merged
