[M] Change in docker-playground[master]: ttcn3-hnbgw: Update config files for latest after osmo-hnbgw new release

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34399?usp=email ) Change subject: ttcn3-hnbgw: Update config files for latest after osmo-hnbgw new release ...................................................................... ttcn3-hnbgw: Update config files for latest after osmo-hnbgw new release Change-Id: Id184686ba50ec07532b2f11cc9513626f66ed94c --- M ttcn3-hnbgw-test/jenkins.sh D ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg D ttcn3-hnbgw-test/osmo-stp-legacy.cfg D ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw-legacy.cfg 4 files changed, 11 insertions(+), 179 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/ttcn3-hnbgw-test/jenkins.sh b/ttcn3-hnbgw-test/jenkins.sh index 308d562..c47c9ca 100755 --- a/ttcn3-hnbgw-test/jenkins.sh +++ b/ttcn3-hnbgw-test/jenkins.sh @@ -31,10 +31,6 @@ mkdir $base_dir/hnbgw-tester/unix cp "$tests_cfg" $base_dir/hnbgw-tester/ write_mp_osmo_repo "$base_dir/hnbgw-tester/HNBGW_Tests.cfg" - # Can be removed once a new release osmo-hnbgw > 1.4.0 is avilable: - if ! image_suffix_is_master; then - sed -i 's/HNBGW_Tests.mp_validate_talloc_asn1 := true/HNBGW_Tests.mp_validate_talloc_asn1 := false/g' "$base_dir/hnbgw-tester/HNBGW_Tests.cfg" - fi mkdir $base_dir/stp cp "$stp_cfg" $base_dir/stp/osmo-stp.cfg @@ -82,19 +78,9 @@ docker_kill_wait ${BUILD_TAG}-stp } -osmo_stp_cfg="osmo-stp.cfg" -osmo_hnbgw_cfg="osmo-hnbgw.cfg" -osmo_hnbgw_with_pfcp_cfg="with-pfcp/osmo-hnbgw.cfg" - -if image_suffix_is_latest; then - osmo_stp_cfg="osmo-stp-legacy.cfg" - osmo_hnbgw_cfg="osmo-hnbgw-legacy.cfg" - osmo_hnbgw_with_pfcp_cfg="with-pfcp/osmo-hnbgw-legacy.cfg" -fi - echo Testing without PFCP -run_tests "$VOL_BASE_DIR" "HNBGW_Tests.cfg" $osmo_stp_cfg $osmo_hnbgw_cfg +run_tests "$VOL_BASE_DIR" "HNBGW_Tests.cfg" "osmo-stp.cfg" "osmo-hnbgw.cfg" echo Testing with PFCP mkdir "$VOL_BASE_DIR_PFCP" -run_tests "$VOL_BASE_DIR_PFCP" "with-pfcp/HNBGW_Tests.cfg" $osmo_stp_cfg $osmo_hnbgw_with_pfcp_cfg +run_tests "$VOL_BASE_DIR_PFCP" "with-pfcp/HNBGW_Tests.cfg" "osmo-stp.cfg" "with-pfcp/osmo-hnbgw.cfg" diff --git a/ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg b/ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg deleted file mode 100644 index 07413a4..0000000 --- a/ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg +++ /dev/null @@ -1,50 +0,0 @@ -! -! OsmoHNBGW (1.1.0) configuration saved from vty -!! -! -log gsmtap 172.18.35.203 - logging level set-all debug - logging filter all 1 -! -log stderr - logging filter all 1 - logging color 1 - logging print category-hex 1 - logging print category 1 - logging print thread-id 0 - logging print extended-timestamp 1 - logging print file 1 - logging level set-all debug -! -line vty - no login - bind 0.0.0.0 -ctrl - bind 0.0.0.0 -! -cs7 instance 0 - asp asp-clnt-msc-0 2905 2905 m3ua - local-ip 172.18.35.20 - remote-ip 172.18.35.200 - role asp - sctp-role client - point-code 0.23.5 - sccp-address msc - routing-indicator PC - point-code 0.23.4 - sccp-address sgsn - routing-indicator PC - point-code 0.23.1 -hnbgw - log-prefix hnb-id - iuh - local-ip 172.18.35.20 - local-port 29169 - hnbap-allow-tmsi 1 - iucs - remote-addr msc - iups - remote-addr sgsn - mgcp - mgw local-ip 172.18.35.20 - mgw remote-ip 172.18.35.203 diff --git a/ttcn3-hnbgw-test/osmo-stp-legacy.cfg b/ttcn3-hnbgw-test/osmo-stp-legacy.cfg deleted file mode 100644 index 16ab3fa..0000000 --- a/ttcn3-hnbgw-test/osmo-stp-legacy.cfg +++ /dev/null @@ -1,56 +0,0 @@ -! -! OsmoSTP (0.8.1) configuration saved from vty -!! -! -log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print extended-timestamp 1 - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 debug - logging level lsccp debug - logging level lsua debug - logging level lm3ua debug - logging level lmgcp notice -! -line vty - no login -! -cs7 instance 0 - xua rkm routing-key-allocation dynamic-permitted - asp virt-msc0-0 23905 2905 m3ua - local-ip 172.18.35.200 - remote-ip 172.18.35.203 - role sg - sctp-role server - as virt-msc0 m3ua - asp virt-msc0-0 - routing-key 1 0.23.4 - asp virt-sgsn0-0 23906 2905 m3ua - local-ip 172.18.35.200 - remote-ip 172.18.35.203 - role sg - sctp-role server - as virt-sgsn0 m3ua - asp virt-sgsn0-0 - routing-key 2 0.23.1 - - - route-table system - update route 0.23.4 7.255.7 linkset virt-msc0 - update route 0.23.1 7.255.7 linkset virt-sgsn0 - listen m3ua 2905 - accept-asp-connections dynamic-permitted diff --git a/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw-legacy.cfg b/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw-legacy.cfg deleted file mode 100644 index 7ccbc7b..0000000 --- a/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw-legacy.cfg +++ /dev/null @@ -1,57 +0,0 @@ -! -! OsmoHNBGW (1.1.0) configuration saved from vty -!! -! -log gsmtap 172.18.35.203 - logging level set-all debug - logging filter all 1 -! -log stderr - logging filter all 1 - logging color 1 - logging print category-hex 1 - logging print category 1 - logging print thread-id 0 - logging print extended-timestamp 1 - logging print file 1 - logging level set-all debug -! -line vty - no login - bind 0.0.0.0 -ctrl - bind 0.0.0.0 -! -cs7 instance 0 - asp asp-clnt-msc-0 2905 2905 m3ua - local-ip 172.18.35.20 - remote-ip 172.18.35.200 - role asp - sctp-role client - point-code 0.23.5 - sccp-address msc - routing-indicator PC - point-code 0.23.4 - sccp-address sgsn - routing-indicator PC - point-code 0.23.1 -hnbgw - log-prefix hnb-id - iuh - local-ip 172.18.35.20 - local-port 29169 - hnbap-allow-tmsi 1 - iucs - remote-addr msc - iups - remote-addr sgsn - mgcp - mgw local-ip 172.18.35.20 - mgw remote-ip 172.18.35.203 - pfcp - remote-addr 172.18.35.203 - local-addr 172.18.35.20 - # so far HNBGW_Tests.ttcn does not heed the port an Assoc Setup Req came from, it always responds to port 8805 - local-port 8805 - # send PFCP Assoc Setup Req more often - timer pfcp x26 5 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34399?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id184686ba50ec07532b2f11cc9513626f66ed94c Gerrit-Change-Number: 34399 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged