diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2020-08-21 17:57:02 +0200 |
|---|---|---|
| committer | laforge <laforge@osmocom.org> | 2020-08-27 10:47:28 +0000 |
| commit | 8d4a97a3fc9fb75fd2edbdc5c5d50df93a761b1f (patch) | |
| tree | 06d3ba932054733ddd8e8ffcc9378cb55b2efdca | |
| parent | 49fa19047099d0e4239af2ae10b7c9b863db76f3 (diff) | |
ttcn3-stp: Configure M3UA setup to use IPv6 together with IPv4
Depends: libosmo-sccp.git Change-Id I09226a5cecc37dd4676acd61c2051befe5234cb3
Depends: osmo-ttcn3-hacks.git Change-Id Ib1925ed1df5cea3fa66f28b5625532d454a2c338
Change-Id: Id6e197cc3ba71e36f29ceec44742b7452a47b36b
| -rw-r--r-- | ttcn3-stp-test/STP_Tests.cfg | 6 | ||||
| -rwxr-xr-x | ttcn3-stp-test/jenkins.sh | 11 | ||||
| -rw-r--r-- | ttcn3-stp-test/osmo-stp.cfg | 10 |
3 files changed, 23 insertions, 4 deletions
diff --git a/ttcn3-stp-test/STP_Tests.cfg b/ttcn3-stp-test/STP_Tests.cfg index ec95058..5a95e9a 100644 --- a/ttcn3-stp-test/STP_Tests.cfg +++ b/ttcn3-stp-test/STP_Tests.cfg @@ -9,8 +9,10 @@ *.VTY.CTRL_HOSTNAME := "172.18.19.200" [MODULE_PARAMETERS] -STP_Tests_Common.mp_stp_ip := "172.18.19.200"; -STP_Tests_Common.mp_local_ip := "172.18.19.203"; +STP_Tests_IPA.mp_stp_ipa_ip := "172.18.19.200"; +STP_Tests_M3UA.mp_stp_m3ua_ip := { "172.18.19.200", "fd02:db8:19::200" }; +STP_Tests_IPA.mp_local_ipa_ip := "172.18.19.203"; +STP_Tests_M3UA.mp_local_m3ua_ip := { "172.18.19.203", "fd02:db8:19::203" }; diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh index 6b6a2de..a53c58b 100755 --- a/ttcn3-stp-test/jenkins.sh +++ b/ttcn3-stp-test/jenkins.sh @@ -12,11 +12,18 @@ cp STP_Tests.cfg $VOL_BASE_DIR/stp-tester/ mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ +# Disable IPv6 until libosmo-sccp.git release > 1.3.0 is available +if [ "$IMAGE_SUFFIX" = "latest" ]; then + sed "/fd02:db8/d" -i "$VOL_BASE_DIR/stp/osmo-stp.cfg" + sed 's/, "fd02:db8:19::203"//g' -i "$VOL_BASE_DIR/stp-tester/STP_Tests.cfg" + sed 's/, "fd02:db8:19::200"//g' -i "$VOL_BASE_DIR/stp-tester/STP_Tests.cfg" +fi + network_create 19 echo Starting container with STP docker run --rm \ - --network $NET_NAME --ip 172.18.19.200 \ + --network $NET_NAME --ip 172.18.19.200 --ip6 fd02:db8:19::200 \ --ulimit core=-1 \ -v $VOL_BASE_DIR/stp:/data \ --name ${BUILD_TAG}-stp -d \ @@ -25,7 +32,7 @@ docker run --rm \ echo Starting container with STP testsuite docker run --rm \ - --network $NET_NAME --ip 172.18.19.203 \ + --network $NET_NAME --ip 172.18.19.203 --ip6 fd02:db8:19::203 \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ -v $VOL_BASE_DIR/stp-tester:/data \ diff --git a/ttcn3-stp-test/osmo-stp.cfg b/ttcn3-stp-test/osmo-stp.cfg index 20fb298..9e4447c 100644 --- a/ttcn3-stp-test/osmo-stp.cfg +++ b/ttcn3-stp-test/osmo-stp.cfg @@ -26,16 +26,24 @@ cs7 instance 0 ! asp asp-sender 9999 2905 m3ua local-ip 172.18.19.200 + local-ip fd02:db8:19::200 remote-ip 172.18.19.203 + remote-ip fd02:db8:19::203 asp asp-receiver0 10000 2905 m3ua local-ip 172.18.19.200 + local-ip fd02:db8:19::200 remote-ip 172.18.19.203 + remote-ip fd02:db8:19::203 asp asp-receiver1 10001 2905 m3ua local-ip 172.18.19.200 + local-ip fd02:db8:19::200 remote-ip 172.18.19.203 + remote-ip fd02:db8:19::203 asp asp-client0 10002 2906 m3ua local-ip 172.18.19.200 + local-ip fd02:db8:19::200 remote-ip 172.18.19.203 + remote-ip fd02:db8:19::203 sctp-role client role asp as as-sender m3ua @@ -109,6 +117,8 @@ cs7 instance 0 !SERVERS: ! listen m3ua 2905 + local-ip 172.18.19.200 + local-ip fd02:db8:19::200 accept-asp-connections dynamic-permitted listen ipa 5000 accept-asp-connections dynamic-permitted |