[XS] Change in osmo-ttcn3-hacks[master]: testenv: bridge: change default IPs 201 -> 1

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38370?usp=email ) Change subject: testenv: bridge: change default IPs 201 -> 1 ...................................................................... testenv: bridge: change default IPs 201 -> 1 During code review it was decided that we want to keep the 127.0.0.1 (and other 127.0.0.x) IPs in the configs, so one can start the testsuite with osmo-ggsn directly on the host without using testenv scripts too, with the same config. The testenv script for osmo-ggsn will replace 127.0.0.x with 172.18.3.x on the fly before the testsuite starts, so we can run osmo-ggsn optionally in QEMU on 172.18.3.2, which will be bridged to the host. 172.18.3.1 will be used by the GGSN testsuite now, instead of 172.18.3.201 as previously planned, so change the default IP of the bridge. The bridge is not used for another testsuite yet. Add the 201 IPs as EXTRA_IPS for the non-QEMU case, as they are configured as DNS IPs and tests need to be able to reach them. Change-Id: Ied055e6e4d6214fd5247694e697a35a1e8ff1966 --- M _testenv/data/scripts/add_remove_testenv0_bridge.sh M ggsn_tests/open5gs/testenv.sh M ggsn_tests/osmo-ggsn/testenv.sh 3 files changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/_testenv/data/scripts/add_remove_testenv0_bridge.sh b/_testenv/data/scripts/add_remove_testenv0_bridge.sh index cb1b6a3..71036e1 100755 --- a/_testenv/data/scripts/add_remove_testenv0_bridge.sh +++ b/_testenv/data/scripts/add_remove_testenv0_bridge.sh @@ -3,8 +3,8 @@ # bridge device, which can be used to talk to a SUT running in QEMU. # Set env var EXTRA_IPS to add additional IP addresses to the device. DEV="testenv0" -IP4="172.18.3.201/24" -IP6="fd02:db8:3::201/128" +IP4="172.18.3.1/24" +IP6="fd02:db8:3::1/128" set -x add_bridge() { diff --git a/ggsn_tests/open5gs/testenv.sh b/ggsn_tests/open5gs/testenv.sh index e06d771..32563fb 100755 --- a/ggsn_tests/open5gs/testenv.sh +++ b/ggsn_tests/open5gs/testenv.sh @@ -69,7 +69,7 @@ # Add a bridge reachable through the GTP tunnel that can answer ICMP # pings (for e.g. TC_pdp4_act_deact_gtpu_access). The bridge is also used to # connect the SUT when it runs in QEMU. -add_remove_testenv0_bridge.sh +EXTRA_IPS="172.18.3.201 fd02:db8:3::201" add_remove_testenv0_bridge.sh case "$TESTENV_CLEAN_REASON" in prepare) diff --git a/ggsn_tests/osmo-ggsn/testenv.sh b/ggsn_tests/osmo-ggsn/testenv.sh index 0275ad2..bded804 100755 --- a/ggsn_tests/osmo-ggsn/testenv.sh +++ b/ggsn_tests/osmo-ggsn/testenv.sh @@ -52,7 +52,7 @@ # Add a bridge reachable through the GTP tunnel that can answer ICMP # pings (for e.g. TC_pdp4_act_deact_gtpu_access). The bridge is also used to # connect the SUT when it runs in QEMU. -add_remove_testenv0_bridge.sh +EXTRA_IPS="172.18.3.201 fd02:db8:3::201" add_remove_testenv0_bridge.sh case "$TESTENV_CLEAN_REASON" in prepare) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38370?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ied055e6e4d6214fd5247694e697a35a1e8ff1966 Gerrit-Change-Number: 38370 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>