laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/37626?usp=email )
Change subject: ttcn3-stp-test: remove <= 1.8.x code path ......................................................................
ttcn3-stp-test: remove <= 1.8.x code path
Change-Id: I3c134df2e194dbad47261eed5c0b3b54ed39a383 --- M ttcn3-stp-test/jenkins.sh D ttcn3-stp-test/osmo-stp-tcp.confmerge M ttcn3-stp-test/osmo-stp.cfg 3 files changed, 36 insertions(+), 35 deletions(-)
Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified
diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh index 9975f5e..35393e3 100755 --- a/ttcn3-stp-test/jenkins.sh +++ b/ttcn3-stp-test/jenkins.sh @@ -16,13 +16,6 @@ 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 osmo_repo_is_nightly; then - osmo-config-merge ./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 deleted file mode 100644 index 8772c35..0000000 --- a/ttcn3-stp-test/osmo-stp-tcp.confmerge +++ /dev/null @@ -1,28 +0,0 @@ -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 diff --git a/ttcn3-stp-test/osmo-stp.cfg b/ttcn3-stp-test/osmo-stp.cfg index 28e2363..16181c2 100644 --- a/ttcn3-stp-test/osmo-stp.cfg +++ b/ttcn3-stp-test/osmo-stp.cfg @@ -21,6 +21,33 @@ ! cs7 instance 0 point-code format 24 + 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 ! !M3UA AS/ASP: !
-
laforge