Change in docker-playground[master]: PCU: Differentiate between tests with classic and SNS Gb dialects

Harald Welte gerrit-no-reply at lists.osmocom.org
Thu Mar 14 20:42:23 UTC 2019


Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/13254


Change subject: PCU: Differentiate between tests with classic and SNS Gb dialects
......................................................................

PCU: Differentiate between tests with classic and SNS Gb dialects

OsmoPCU needs to have the gb-dialect parameter configured right from
startup.  This means we'll split the ttcn3-pcu-test into two suites,
similarly to how we deal with AoIP / SCCPlite in the ttcn3-bsc-test.

Change-Id: I6e844f9ac4b87e801661fb1a1bdd25a15148f474
---
A ttcn3-pcu-test-sns/jenkins.sh
A ttcn3-pcu-test-sns/sns
M ttcn3-pcu-test/PCU_Tests.cfg
A ttcn3-pcu-test/jenkins-sns.sh
A ttcn3-pcu-test/sns/PCU_Tests.cfg
A ttcn3-pcu-test/sns/osmo-pcu.cfg
6 files changed, 82 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/54/13254/1

diff --git a/ttcn3-pcu-test-sns/jenkins.sh b/ttcn3-pcu-test-sns/jenkins.sh
new file mode 120000
index 0000000..8a1c657
--- /dev/null
+++ b/ttcn3-pcu-test-sns/jenkins.sh
@@ -0,0 +1 @@
+../ttcn3-pcu-test/jenkins-sns.sh
\ No newline at end of file
diff --git a/ttcn3-pcu-test-sns/sns b/ttcn3-pcu-test-sns/sns
new file mode 120000
index 0000000..c2fe958
--- /dev/null
+++ b/ttcn3-pcu-test-sns/sns
@@ -0,0 +1 @@
+../ttcn3-pcu-test/sns
\ No newline at end of file
diff --git a/ttcn3-pcu-test/PCU_Tests.cfg b/ttcn3-pcu-test/PCU_Tests.cfg
index 43ce941..07af661 100644
--- a/ttcn3-pcu-test/PCU_Tests.cfg
+++ b/ttcn3-pcu-test/PCU_Tests.cfg
@@ -21,4 +21,3 @@
 
 [EXECUTE]
 PCU_Tests_RAW.control
-PCU_Tests_RAW_SNS.control
diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh
new file mode 100755
index 0000000..7f57c09
--- /dev/null
+++ b/ttcn3-pcu-test/jenkins-sns.sh
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+. ../jenkins-common.sh
+IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
+docker_images_require \
+	"debian-jessie-build" \
+	"osmo-pcu-$IMAGE_SUFFIX" \
+	"debian-stretch-titan" \
+	"ttcn3-pcu-test"
+
+network_create 172.18.14.0/24
+
+mkdir $VOL_BASE_DIR/pcu-tester
+mkdir $VOL_BASE_DIR/pcu-tester/unix
+cp sns/PCU_Tests.cfg $VOL_BASE_DIR/pcu-tester/
+
+mkdir $VOL_BASE_DIR/pcu
+mkdir $VOL_BASE_DIR/pcu/unix
+cp sns/osmo-pcu.cfg $VOL_BASE_DIR/pcu/
+
+mkdir $VOL_BASE_DIR/unix
+
+echo Starting container with PCU
+docker run	--rm \
+		--network $NET_NAME --ip 172.18.14.101 \
+		-v $VOL_BASE_DIR/pcu:/data \
+		-v $VOL_BASE_DIR/unix:/data/unix \
+		--name ${BUILD_TAG}-pcu-sns -d \
+		$REPO_USER/osmo-pcu-$IMAGE_SUFFIX \
+		/usr/local/bin/respawn.sh osmo-pcu -c /data/osmo-pcu.cfg
+
+echo Starting container with PCU testsuite
+docker run	--rm \
+		--network $NET_NAME --ip 172.18.14.10 \
+		-e "TTCN3_PCAP_PATH=/data" \
+		-v $VOL_BASE_DIR/pcu-tester:/data \
+		-v $VOL_BASE_DIR/unix:/data/unix \
+		--name ${BUILD_TAG}-ttcn3-pcu-test-sns \
+		$REPO_USER/ttcn3-pcu-test
+
+echo Stopping containers
+docker container kill ${BUILD_TAG}-pcu-sns
+
+network_remove
+rm -rf $VOL_BASE_DIR/unix
+collect_logs
diff --git a/ttcn3-pcu-test/sns/PCU_Tests.cfg b/ttcn3-pcu-test/sns/PCU_Tests.cfg
new file mode 100644
index 0000000..07db9b3
--- /dev/null
+++ b/ttcn3-pcu-test/sns/PCU_Tests.cfg
@@ -0,0 +1,23 @@
+[ORDERED_INCLUDE]
+"/osmo-ttcn3-hacks/Common.cfg"
+"/osmo-ttcn3-hacks/pcu/PCU_Tests.default"
+
+[LOGGING]
+
+[TESTPORT_PARAMETERS]
+
+[MODULE_PARAMETERS]
+PCU_Tests_RAW.mp_pcu_sock_path := "/data/unix/pcu_bts"
+PCU_Tests.mp_nsconfig := {
+	local_ip := "172.18.14.10",
+	local_udp_port := 23000,
+	remote_ip := "172.18.14.101",
+	remote_udp_port := 23000,
+	nsvci := 1234,
+	nsei := 1234
+}
+
+[MAIN_CONTROLLER]
+
+[EXECUTE]
+PCU_Tests_RAW_SNS.control
diff --git a/ttcn3-pcu-test/sns/osmo-pcu.cfg b/ttcn3-pcu-test/sns/osmo-pcu.cfg
new file mode 100644
index 0000000..34ba20d
--- /dev/null
+++ b/ttcn3-pcu-test/sns/osmo-pcu.cfg
@@ -0,0 +1,11 @@
+line vty
+ no login
+ bind 0.0.0.0
+pcu
+ flow-control-interval 10
+ cs 2
+ alloc-algorithm dynamic
+ alpha 0
+ gamma 0
+ pcu-socket /data/unix/pcu_bts
+ gb-dialect ip-sns

-- 
To view, visit https://gerrit.osmocom.org/13254
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e844f9ac4b87e801661fb1a1bdd25a15148f474
Gerrit-Change-Number: 13254
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190314/d6f1a95a/attachment.html>


More information about the gerrit-log mailing list