<p>daniel <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/20661">View Change</a></p><div style="white-space:pre-wrap">Approvals:
daniel: Looks good to me, but someone else must approve; Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add GBProxy_Test<br><br>Change-Id: I6661887c741b44aa0927079f79b4d5fcc40d8acf<br>---<br>A ttcn3-gbproxy-test/Dockerfile<br>A ttcn3-gbproxy-test/GBProxy_Tests.cfg<br>A ttcn3-gbproxy-test/Makefile<br>A ttcn3-gbproxy-test/jenkins.sh<br>A ttcn3-gbproxy-test/osmo-gbproxy.cfg<br>5 files changed, 194 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ttcn3-gbproxy-test/Dockerfile b/ttcn3-gbproxy-test/Dockerfile</span><br><span>new file mode 100644</span><br><span>index 0000000..05cd65d</span><br><span>--- /dev/null</span><br><span>+++ b/ttcn3-gbproxy-test/Dockerfile</span><br><span>@@ -0,0 +1,35 @@</span><br><span style="color: hsl(120, 100%, 40%);">+ARG USER</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/debian-stretch-titan</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+RUN mkdir /root/projects && (cd /root/projects && ln -sf / git)</span><br><span style="color: hsl(120, 100%, 40%);">+RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout -f -B master origin/master && \</span><br><span style="color: hsl(120, 100%, 40%);">+ make deps</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+RUN git config --global user.email docker@dock.er && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git config --global user.name "Dock Er"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMO_TTCN3_BRANCH="master"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit</span><br><span style="color: hsl(120, 100%, 40%);">+RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \</span><br><span style="color: hsl(120, 100%, 40%);">+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span style="color: hsl(120, 100%, 40%);">+ make gbproxy</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+VOLUME /data</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \</span><br><span style="color: hsl(120, 100%, 40%);">+ ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh /</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+COPY GBProxy_Tests.cfg /data/GBProxy_Tests.cfg</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+CMD cd /data && \</span><br><span style="color: hsl(120, 100%, 40%);">+ /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/gbproxy/GBProxy_Tests; \</span><br><span style="color: hsl(120, 100%, 40%);">+ exit_code=$?; \</span><br><span style="color: hsl(120, 100%, 40%);">+ /osmo-ttcn3-hacks/log_merge.sh GBProxy_Tests --rm; \</span><br><span style="color: hsl(120, 100%, 40%);">+ exit $exit_code</span><br><span>diff --git a/ttcn3-gbproxy-test/GBProxy_Tests.cfg b/ttcn3-gbproxy-test/GBProxy_Tests.cfg</span><br><span>new file mode 100644</span><br><span>index 0000000..97b1ff2</span><br><span>--- /dev/null</span><br><span>+++ b/ttcn3-gbproxy-test/GBProxy_Tests.cfg</span><br><span>@@ -0,0 +1,59 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[ORDERED_INCLUDE]</span><br><span style="color: hsl(120, 100%, 40%);">+# Common configuration, shared between test suites</span><br><span style="color: hsl(120, 100%, 40%);">+"/osmo-ttcn3-hacks/Common.cfg"</span><br><span style="color: hsl(120, 100%, 40%);">+# testsuite specific configuration, not expected to change</span><br><span style="color: hsl(120, 100%, 40%);">+"/osmo-ttcn3-hacks/gbproxy/GBProxy_Tests.default"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Local configuration below</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[LOGGING]</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[TESTPORT_PARAMETERS]</span><br><span style="color: hsl(120, 100%, 40%);">+*.GBPVTY.CTRL_HOSTNAME := "172.18.24.10"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[MODULE_PARAMETERS]</span><br><span style="color: hsl(120, 100%, 40%);">+GBProxy_Tests.mp_nsconfig_sgsn := {</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ address_family := AF_INET,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "172.18.24.103",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "172.18.24.10"</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+GBProxy_Tests.mp_nsconfig_pcu := {</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ address_family := AF_INET,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "172.18.24.103",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "172.18.24.10"</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ address_family := AF_INET,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "172.18.24.103",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "172.18.24.10"</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ address_family := AF_INET,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "172.18.24.103",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "172.18.24.10"</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[MAIN_CONTROLLER]</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[EXECUTE]</span><br><span style="color: hsl(120, 100%, 40%);">+GBProxy_Tests.control</span><br><span>diff --git a/ttcn3-gbproxy-test/Makefile b/ttcn3-gbproxy-test/Makefile</span><br><span>new file mode 100644</span><br><span>index 0000000..8d0e10b</span><br><span>--- /dev/null</span><br><span>+++ b/ttcn3-gbproxy-test/Makefile</span><br><span>@@ -0,0 +1 @@</span><br><span style="color: hsl(120, 100%, 40%);">+include ../make/Makefile</span><br><span>diff --git a/ttcn3-gbproxy-test/jenkins.sh b/ttcn3-gbproxy-test/jenkins.sh</span><br><span>new file mode 100755</span><br><span>index 0000000..acc7350</span><br><span>--- /dev/null</span><br><span>+++ b/ttcn3-gbproxy-test/jenkins.sh</span><br><span>@@ -0,0 +1,60 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#!/bin/sh</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+. ../jenkins-common.sh</span><br><span style="color: hsl(120, 100%, 40%);">+IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"</span><br><span style="color: hsl(120, 100%, 40%);">+docker_images_require \</span><br><span style="color: hsl(120, 100%, 40%);">+ "osmo-sgsn-$IMAGE_SUFFIX" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "ttcn3-gbproxy-test"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+SUBNET=24</span><br><span style="color: hsl(120, 100%, 40%);">+network_create $SUBNET</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+mkdir $VOL_BASE_DIR/gbproxy-tester</span><br><span style="color: hsl(120, 100%, 40%);">+cp GBProxy_Tests.cfg $VOL_BASE_DIR/gbproxy-tester/</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+mkdir $VOL_BASE_DIR/sgsn</span><br><span style="color: hsl(120, 100%, 40%);">+cp osmo-gbproxy.cfg $VOL_BASE_DIR/sgsn/</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Disable features not in latest yet</span><br><span style="color: hsl(120, 100%, 40%);">+if [ "$IMAGE_SUFFIX" = "latest" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ true;</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+mkdir $VOL_BASE_DIR/unix</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+echo Starting container with SGSN</span><br><span style="color: hsl(120, 100%, 40%);">+docker run --rm \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(docker_network_params $SUBNET 10) \</span><br><span style="color: hsl(120, 100%, 40%);">+ --ulimit core=-1 \</span><br><span style="color: hsl(120, 100%, 40%);">+ -v $VOL_BASE_DIR/sgsn:/data \</span><br><span style="color: hsl(120, 100%, 40%);">+ --name ${BUILD_TAG}-sgsn -d \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/osmo-sgsn-$IMAGE_SUFFIX \</span><br><span style="color: hsl(120, 100%, 40%);">+ /bin/sh -c "osmo-gbproxy -c /data/osmo-gbproxy.cfg >/data/osmo-gbproxy.log 2>&1"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+echo Starting container with SGSN testsuite</span><br><span style="color: hsl(120, 100%, 40%);">+docker run --rm \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(docker_network_params $SUBNET 103) \</span><br><span style="color: hsl(120, 100%, 40%);">+ --ulimit core=-1 \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e "TTCN3_PCAP_PATH=/data" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -v $VOL_BASE_DIR/gbproxy-tester:/data \</span><br><span style="color: hsl(120, 100%, 40%);">+ --name ${BUILD_TAG}-ttcn3-gbproxy-test \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/ttcn3-gbproxy-test $@</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+echo Starting container to merge logs</span><br><span style="color: hsl(120, 100%, 40%);">+docker run --rm \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(docker_network_params $SUBNET 103) \</span><br><span style="color: hsl(120, 100%, 40%);">+ --ulimit core=-1 \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e "TTCN3_PCAP_PATH=/data" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -v $VOL_BASE_DIR/gbproxy-tester:/data \</span><br><span style="color: hsl(120, 100%, 40%);">+ --name ${BUILD_TAG}-ttcn3-gbproxy-test-logmerge \</span><br><span style="color: hsl(120, 100%, 40%);">+ --entrypoint /osmo-ttcn3-hacks/log_merge.sh GBProxy_Tests --rm \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/ttcn3-gbproxy-test</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+echo Stopping containers</span><br><span style="color: hsl(120, 100%, 40%);">+docker container kill ${BUILD_TAG}-sgsn</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+network_remove</span><br><span style="color: hsl(120, 100%, 40%);">+collect_logs</span><br><span>diff --git a/ttcn3-gbproxy-test/osmo-gbproxy.cfg b/ttcn3-gbproxy-test/osmo-gbproxy.cfg</span><br><span>new file mode 100644</span><br><span>index 0000000..b1f2c3d</span><br><span>--- /dev/null</span><br><span>+++ b/ttcn3-gbproxy-test/osmo-gbproxy.cfg</span><br><span>@@ -0,0 +1,39 @@</span><br><span style="color: hsl(120, 100%, 40%);">+!</span><br><span style="color: hsl(120, 100%, 40%);">+! Osmocom Gb Proxy (0.9.0.404-6463) configuration saved from vty</span><br><span style="color: hsl(120, 100%, 40%);">+!!</span><br><span style="color: hsl(120, 100%, 40%);">+!</span><br><span style="color: hsl(120, 100%, 40%);">+log gsmtap 172.18.24.103</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level set-all debug</span><br><span style="color: hsl(120, 100%, 40%);">+ logging filter all 1</span><br><span style="color: hsl(120, 100%, 40%);">+!</span><br><span style="color: hsl(120, 100%, 40%);">+log stderr</span><br><span style="color: hsl(120, 100%, 40%);">+ logging filter all 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging color 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging timestamp 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print extended-timestamp 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print file 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level all everything</span><br><span style="color: hsl(120, 100%, 40%);">+!</span><br><span style="color: hsl(120, 100%, 40%);">+line vty</span><br><span style="color: hsl(120, 100%, 40%);">+ no login</span><br><span style="color: hsl(120, 100%, 40%);">+ bind 0.0.0.0</span><br><span style="color: hsl(120, 100%, 40%);">+!</span><br><span style="color: hsl(120, 100%, 40%);">+gbproxy</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn nsei 101</span><br><span style="color: hsl(120, 100%, 40%);">+ns</span><br><span style="color: hsl(120, 100%, 40%);">+ nse 101 nsvci 101</span><br><span style="color: hsl(120, 100%, 40%);">+ nse 101 remote-role sgsn</span><br><span style="color: hsl(120, 100%, 40%);">+ nse 101 encapsulation udp</span><br><span style="color: hsl(120, 100%, 40%);">+ nse 101 remote-ip 172.18.24.103</span><br><span style="color: hsl(120, 100%, 40%);">+ nse 101 remote-port 23000</span><br><span style="color: hsl(120, 100%, 40%);">+ timer tns-block 3</span><br><span style="color: hsl(120, 100%, 40%);">+ timer tns-block-retries 3</span><br><span style="color: hsl(120, 100%, 40%);">+ timer tns-reset 3</span><br><span style="color: hsl(120, 100%, 40%);">+ timer tns-reset-retries 3</span><br><span style="color: hsl(120, 100%, 40%);">+ timer tns-test 30</span><br><span style="color: hsl(120, 100%, 40%);">+ timer tns-alive 3</span><br><span style="color: hsl(120, 100%, 40%);">+ timer tns-alive-retries 10</span><br><span style="color: hsl(120, 100%, 40%);">+ encapsulation udp local-ip 172.18.24.10</span><br><span style="color: hsl(120, 100%, 40%);">+ encapsulation udp local-port 23000</span><br><span style="color: hsl(120, 100%, 40%);">+ encapsulation framerelay-gre enabled 0</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/20661">change 20661</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/docker-playground/+/20661"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: docker-playground </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I6661887c741b44aa0927079f79b4d5fcc40d8acf </div>
<div style="display:none"> Gerrit-Change-Number: 20661 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>