fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36151?usp=email )

Change subject: ttcn3-stp-test: enable M3UA-over-TCP testing for master ......................................................................

ttcn3-stp-test: enable M3UA-over-TCP testing for master

Change-Id: I210b7d62845075dcfe147f2f77603625cc1e64f9 Depends: osmo-ttcn3-hacks.git I5d0b05aa434c057ad379125ac293f5fc9a240b6f Related: osmo-ttcn3-hacks.git I1e2a887aa22f317783b3207494fd707d7b426439 Related: SYS#5424 --- M ttcn3-stp-test/jenkins.sh A ttcn3-stp-test/osmo-stp-tcp.confmerge 2 files changed, 47 insertions(+), 0 deletions(-)

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

diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh index 006bb3b..14cca36 100755 --- a/ttcn3-stp-test/jenkins.sh +++ b/ttcn3-stp-test/jenkins.sh @@ -16,6 +16,13 @@ mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/

+# XXX: M3UA-over-TCP is not supported by osmo-stp <= 1.8.1 +if image_suffix_is_master; then + osmo-config-merge "$VOL_BASE_DIR/stp/osmo-stp.cfg" \ + osmo-stp-tcp.confmerge \ + > "$VOL_BASE_DIR/stp/osmo-stp.cfg" +fi + network_create network_replace_subnet_in_configs

diff --git a/ttcn3-stp-test/osmo-stp-tcp.confmerge b/ttcn3-stp-test/osmo-stp-tcp.confmerge new file mode 100644 index 0000000..8772c35 --- /dev/null +++ b/ttcn3-stp-test/osmo-stp-tcp.confmerge @@ -0,0 +1,28 @@ +cs7 instance 0 + asp asp-sender-tcp 9999 2905 m3ua tcp + local-ip 172.18.19.200 + local-ip fd02:db8:19::200 + remote-ip 172.18.19.203 + remote-ip fd02:db8:19::203 + role sg + transport-role server + asp asp-client0-tcp 10002 2906 m3ua tcp + local-ip 172.18.19.200 + local-ip fd02:db8:19::200 + remote-ip 172.18.19.203 + remote-ip fd02:db8:19::203 + role asp + transport-role client + as as-sender-tcp m3ua + asp asp-sender-tcp + routing-key 1123 123 + as as-client-tcp m3ua + routing-key 1155 155 + asp asp-client0-tcp + route-table system + update route 123 16777215 linkset as-sender-tcp + update route 155 16777215 linkset as-client-tcp + listen m3ua 2905 tcp + local-ip 172.18.19.200 + local-ip fd02:db8:19::200 + accept-asp-connections dynamic-permitted