August 2023 - gerrit-log - lists.osmocom.org

[S] Change in docker-playground[master]: hnbgw-latest: fixup for cnpool: use correct cfg file name

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/34091 ) Change subject: hnbgw-latest: fixup for cnpool: use correct cfg file name ...................................................................... hnbgw-latest: fixup for cnpool: use correct cfg file name Change-Id: I40c2aca069114f9a07840eed11e608921ed65d26 --- M ttcn3-hnbgw-test/jenkins.sh 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/91/34091/1 diff --git a/ttcn3-hnbgw-test/jenkins.sh b/ttcn3-hnbgw-test/jenkins.sh index 97ce303..ece6f16 100755 --- a/ttcn3-hnbgw-test/jenkins.sh +++ b/ttcn3-hnbgw-test/jenkins.sh @@ -41,7 +41,7 @@ mkdir $base_dir/hnbgw mkdir $base_dir/hnbgw/unix - cp "$hnbgw_cfg" $base_dir/hnbgw/ + cp "$hnbgw_cfg" $base_dir/hnbgw/osmo-hnbgw.cfg mkdir $base_dir/unix -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I40c2aca069114f9a07840eed11e608921ed65d26 Gerrit-Change-Number: 34091 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[S] Change in docker-playground[master]: hnbgw: fixup for cnpool: bind CTRL to 0.0.0.0

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34090 ) Change subject: hnbgw: fixup for cnpool: bind CTRL to 0.0.0.0 ...................................................................... hnbgw: fixup for cnpool: bind CTRL to 0.0.0.0 Change-Id: Ia71688f5468b3eabdead2996cc1470e467b9c10b --- M ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg M ttcn3-hnbgw-test/osmo-hnbgw.cfg 2 files changed, 13 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved; Verified diff --git a/ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg b/ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg index 61d6236..07413a4 100644 --- a/ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg +++ b/ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg @@ -19,6 +19,8 @@ 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 diff --git a/ttcn3-hnbgw-test/osmo-hnbgw.cfg b/ttcn3-hnbgw-test/osmo-hnbgw.cfg index 9f75d46..ff6172b 100644 --- a/ttcn3-hnbgw-test/osmo-hnbgw.cfg +++ b/ttcn3-hnbgw-test/osmo-hnbgw.cfg @@ -19,6 +19,8 @@ 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 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia71688f5468b3eabdead2996cc1470e467b9c10b Gerrit-Change-Number: 34090 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years

1
0
0 0

[S] Change in docker-playground[master]: hnbgw: fixup for cnpool: bind CTRL to 0.0.0.0

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34090 ) Change subject: hnbgw: fixup for cnpool: bind CTRL to 0.0.0.0 ...................................................................... Patch Set 1: Verified+1 Code-Review+2 (1 comment) Patchset: PS1: i broke all hnbgw tests, trying to fix it -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia71688f5468b3eabdead2996cc1470e467b9c10b Gerrit-Change-Number: 34090 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Aug 2023 03:41:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

[S] Change in docker-playground[master]: hnbgw: fixup for cnpool: bind CTRL to 0.0.0.0

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/34090 ) Change subject: hnbgw: fixup for cnpool: bind CTRL to 0.0.0.0 ...................................................................... hnbgw: fixup for cnpool: bind CTRL to 0.0.0.0 Change-Id: Ia71688f5468b3eabdead2996cc1470e467b9c10b --- M ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg M ttcn3-hnbgw-test/osmo-hnbgw.cfg 2 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/90/34090/1 diff --git a/ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg b/ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg index 61d6236..07413a4 100644 --- a/ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg +++ b/ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg @@ -19,6 +19,8 @@ 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 diff --git a/ttcn3-hnbgw-test/osmo-hnbgw.cfg b/ttcn3-hnbgw-test/osmo-hnbgw.cfg index 9f75d46..ff6172b 100644 --- a/ttcn3-hnbgw-test/osmo-hnbgw.cfg +++ b/ttcn3-hnbgw-test/osmo-hnbgw.cfg @@ -19,6 +19,8 @@ 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 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia71688f5468b3eabdead2996cc1470e467b9c10b Gerrit-Change-Number: 34090 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[L] Change in docker-playground[master]: hnbgw: adjust cfg for cnpool tests

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33668 ) Change subject: hnbgw: adjust cfg for cnpool tests ...................................................................... hnbgw: adjust cfg for cnpool tests Config changes matching cnpool tests added in osmo-ttcn3-hacks, see 'Related'. Keep a copy of the old config files named "-legacy", to not break the 'latest' tests, because osmo-hnbgw 'latest' does not yet support the new config options. Depends: osmo-ttcn3-hacks I027a059faed3f140f8801f84338956cd004043b5 Change-Id: I94aa0b2adfc48b98cb4b1efe595c2432fc603d6c --- M ttcn3-hnbgw-test/jenkins.sh A ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg M ttcn3-hnbgw-test/osmo-hnbgw.cfg A ttcn3-hnbgw-test/osmo-stp-legacy.cfg M ttcn3-hnbgw-test/osmo-stp.cfg A ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw-legacy.cfg M ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg 7 files changed, 400 insertions(+), 15 deletions(-) Approvals: neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/ttcn3-hnbgw-test/jenkins.sh b/ttcn3-hnbgw-test/jenkins.sh index 51dd825..97ce303 100755 --- a/ttcn3-hnbgw-test/jenkins.sh +++ b/ttcn3-hnbgw-test/jenkins.sh @@ -82,9 +82,19 @@ 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" "with-pfcp/osmo-hnbgw.cfg" +run_tests "$VOL_BASE_DIR_PFCP" "with-pfcp/HNBGW_Tests.cfg" $osmo_stp_cfg $osmo_hnbgw_with_pfcp_cfg diff --git a/ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg b/ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg new file mode 100644 index 0000000..61d6236 --- /dev/null +++ b/ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg @@ -0,0 +1,48 @@ +! +! 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 +! +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-hnbgw.cfg b/ttcn3-hnbgw-test/osmo-hnbgw.cfg index 61d6236..9f75d46 100644 --- a/ttcn3-hnbgw-test/osmo-hnbgw.cfg +++ b/ttcn3-hnbgw-test/osmo-hnbgw.cfg @@ -27,22 +27,101 @@ role asp sctp-role client point-code 0.23.5 - sccp-address msc + sccp-address msc-naught routing-indicator PC point-code 0.23.4 - sccp-address sgsn + + sccp-address msc-one + routing-indicator PC + point-code 0.0.2 + + sccp-address msc-two + routing-indicator PC + point-code 0.0.3 + + sccp-address msc-three + routing-indicator PC + point-code 0.0.4 + + sccp-address sgsn-naught routing-indicator PC point-code 0.23.1 + + sccp-address sgsn-one + routing-indicator PC + point-code 0.1.2 + + sccp-address sgsn-two + routing-indicator PC + point-code 0.1.3 + + sccp-address sgsn-three + routing-indicator PC + point-code 0.1.4 + hnbgw log-prefix hnb-id iuh local-ip 172.18.35.20 local-port 29169 hnbap-allow-tmsi 1 + # don't spam RANAP RESET messages for up to eight CN links across all tests + timer hnbgw T4 60 + +msc 0 + remote-addr msc-naught + +msc 1 + remote-addr msc-one + +msc 2 + remote-addr msc-two + +msc 3 + remote-addr msc-three + +sgsn 0 + remote-addr sgsn-naught + +sgsn 1 + remote-addr sgsn-one + +sgsn 2 + remote-addr sgsn-two + +sgsn 3 + remote-addr sgsn-three + +hnbgw iucs - remote-addr msc + nri bitlen 10 + # a NULL NRI that is outside the NRI ranges used by the MSCs: + nri null add 0 + # a NULL NRI that is also used by an MSC: + nri null add 1 +msc 0 + nri add 1 255 +msc 1 + nri add 256 511 +msc 2 + nri add 512 767 + # range 768-1000 is not assigned to any MSC on purpose +msc 3 + nri add 1001 1023 + +hnbgw iups - remote-addr sgsn - mgcp - mgw local-ip 172.18.35.20 - mgw remote-ip 172.18.35.203 + nri bitlen 10 + # a NULL NRI that is outside the NRI ranges used by the SGSNs: + nri null add 0 + # a NULL NRI that is also used by an SGSN: + nri null add 1 +sgsn 0 + nri add 1 255 +sgsn 1 + nri add 256 511 +sgsn 2 + nri add 512 767 + # range 768-1000 is not assigned to any SGSN on purpose +sgsn 3 + nri add 1001 1023 diff --git a/ttcn3-hnbgw-test/osmo-stp-legacy.cfg b/ttcn3-hnbgw-test/osmo-stp-legacy.cfg new file mode 100644 index 0000000..16ab3fa --- /dev/null +++ b/ttcn3-hnbgw-test/osmo-stp-legacy.cfg @@ -0,0 +1,56 @@ +! +! 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/osmo-stp.cfg b/ttcn3-hnbgw-test/osmo-stp.cfg index 16ab3fa..fedf6a8 100644 --- a/ttcn3-hnbgw-test/osmo-stp.cfg +++ b/ttcn3-hnbgw-test/osmo-stp.cfg @@ -39,6 +39,25 @@ as virt-msc0 m3ua asp virt-msc0-0 routing-key 1 0.23.4 + + asp virt-msc1-0 23907 2905 m3ua + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + as virt-msc1 m3ua + asp virt-msc1-0 + routing-key 3 0.0.2 + + asp virt-msc2-0 23909 2905 m3ua + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + as virt-msc2 m3ua + asp virt-msc2-0 + routing-key 5 0.0.3 + asp virt-sgsn0-0 23906 2905 m3ua local-ip 172.18.35.200 remote-ip 172.18.35.203 @@ -48,9 +67,30 @@ asp virt-sgsn0-0 routing-key 2 0.23.1 + asp virt-sgsn1-0 23908 2905 m3ua + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + as virt-sgsn1 m3ua + asp virt-sgsn1-0 + routing-key 4 0.1.2 + + asp virt-sgsn2-0 23910 2905 m3ua + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + as virt-sgsn2 m3ua + asp virt-sgsn2-0 + routing-key 6 0.1.3 route-table system update route 0.23.4 7.255.7 linkset virt-msc0 + update route 0.0.2 7.255.7 linkset virt-msc1 + update route 0.0.3 7.255.7 linkset virt-msc2 update route 0.23.1 7.255.7 linkset virt-sgsn0 + update route 0.1.2 7.255.7 linkset virt-sgsn1 + update route 0.1.3 7.255.7 linkset virt-sgsn2 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 new file mode 100644 index 0000000..329ea7d --- /dev/null +++ b/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw-legacy.cfg @@ -0,0 +1,55 @@ +! +! 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 +! +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 diff --git a/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg b/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg index 329ea7d..b56ac14 100644 --- a/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg +++ b/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg @@ -27,22 +27,44 @@ role asp sctp-role client point-code 0.23.5 - sccp-address msc + sccp-address msc-naught routing-indicator PC point-code 0.23.4 - sccp-address sgsn + + sccp-address msc-one + routing-indicator PC + point-code 0.0.2 + + sccp-address msc-two + routing-indicator PC + point-code 0.0.3 + + sccp-address msc-three + routing-indicator PC + point-code 0.0.4 + + sccp-address sgsn-naught routing-indicator PC point-code 0.23.1 + + sccp-address sgsn-one + routing-indicator PC + point-code 0.1.2 + + sccp-address sgsn-two + routing-indicator PC + point-code 0.1.3 + + sccp-address sgsn-three + routing-indicator PC + point-code 0.1.4 + 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 @@ -53,3 +75,61 @@ local-port 8805 # send PFCP Assoc Setup Req more often timer pfcp x26 5 + +msc 0 + remote-addr msc-naught + +msc 1 + remote-addr msc-one + +msc 2 + remote-addr msc-two + +msc 3 + remote-addr msc-three + +sgsn 0 + remote-addr sgsn-naught + +sgsn 1 + remote-addr sgsn-one + +sgsn 2 + remote-addr sgsn-two + +sgsn 3 + remote-addr sgsn-three + +hnbgw + iucs + nri bitlen 10 + # a NULL NRI that is outside the NRI ranges used by the MSCs: + nri null add 0 + # a NULL NRI that is also used by an MSC: + nri null add 1 +msc 0 + nri add 1 255 +msc 1 + nri add 256 511 +msc 2 + nri add 512 767 + # range 768-1000 is not assigned to any MSC on purpose +msc 3 + nri add 1001 1023 + +hnbgw + iups + nri bitlen 10 + # a NULL NRI that is outside the NRI ranges used by the SGSNs: + nri null add 0 + # a NULL NRI that is also used by an SGSN: + nri null add 1 +sgsn 0 + nri add 1 255 +sgsn 1 + nri add 256 511 +sgsn 2 + nri add 512 767 + # range 768-1000 is not assigned to any SGSN on purpose +sgsn 3 + nri add 1001 1023 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I94aa0b2adfc48b98cb4b1efe595c2432fc603d6c Gerrit-Change-Number: 33668 Gerrit-PatchSet: 6 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: ctrl: f_counter_name_vals_get_n(): add start_idx, for hnbgw

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33483 ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: ctrl: f_counter_name_vals_get_n(): add start_idx, for hnbgw ...................................................................... ctrl: f_counter_name_vals_get_n(): add start_idx, for hnbgw Allow starting with a specific 'msc' / 'sgsn' instance without having to read all the lower numbers along. For HNBGW_Tests.ttcn. Change-Id: I9b74a1df9e115883b4b0ac0f606a370c6aca7f40 --- M library/Osmocom_CTRL_Functions.ttcn 1 file changed, 15 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/Osmocom_CTRL_Functions.ttcn b/library/Osmocom_CTRL_Functions.ttcn index 2c90de4..75f8646 100644 --- a/library/Osmocom_CTRL_Functions.ttcn +++ b/library/Osmocom_CTRL_Functions.ttcn @@ -233,10 +233,11 @@ /* Retrieve the first N instances' rate counter values of the given names */ function f_counter_name_vals_get_n(IPA_CTRL_PT pt, charstring instance_name := "msc", - integer instance_count, CounterNameVals counternames) + integer instance_count, CounterNameVals counternames, + integer start_idx := 0) return CounterNameValsList { var CounterNameValsList valslist; - for (var integer instance_nr := 0; instance_nr < instance_count; instance_nr := instance_nr + 1) { + for (var integer instance_nr := start_idx; instance_nr < start_idx + instance_count; instance_nr := instance_nr + 1) { valslist[instance_nr] := f_counter_name_vals_get(pt, instance_name, instance_nr, counternames); } log("retrieved rate counters: ", instance_name, ": ", valslist); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33483 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9b74a1df9e115883b4b0ac0f606a370c6aca7f40 Gerrit-Change-Number: 33483 Gerrit-PatchSet: 7 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: do not duplicate MSC_RanOps

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33481 ) Change subject: hnbgw: do not duplicate MSC_RanOps ...................................................................... hnbgw: do not duplicate MSC_RanOps Change-Id: I556eb4293f51b56a526d4e60c3ac2aa357a8d3e7 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 10 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index a89837a..fb618b4 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -430,19 +430,7 @@ } /* MSC emulation */ - var RanOps ranops := { - ranap_create_cb := refers(RAN_Emulation.RanapExpectedCreateCallback), - ranap_unitdata_cb := omit, - ps_domain := false, - decode_dtap := false, - role_ms := false, - protocol := RAN_PROTOCOL_RANAP, - transport := RANAP_TRANSPORT_IuCS, - use_osmux := false, - bssap_reset_retries := 1, - sccp_addr_local := omit, - sccp_addr_peer := omit - }; + var RanOps ranops := MSC_RanOps; for (var integer i := 0; i < nr_msc; i := i + 1) { var integer cn_idx := FIRST_MSC_IDX + i; f_ran_adapter_init(g_cn[cn_idx], mp_cn_cfg[cn_idx], "HNBGW_Test", ranops); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33481 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I556eb4293f51b56a526d4e60c3ac2aa357a8d3e7 Gerrit-Change-Number: 33481 Gerrit-PatchSet: 6 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: call f_start_hnbs() by default

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33482 ) ( 5 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: hnbgw: call f_start_hnbs() by default ...................................................................... hnbgw: call f_start_hnbs() by default Most tests need to run f_start_hnbs() directly after f_init(), so make that the default behavior. The three tests that don't want f_start_hnbs() to run now pass a new arg, f_init(start_hnb := false). Change-Id: I2b29ce66aee0b2d57fa26e6110f06292c481ab6b --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 25 insertions(+), 20 deletions(-) Approvals: neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index fb618b4..f196e64 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -408,7 +408,8 @@ } /* global initialization function */ -function f_init(charstring id := "HNBGW", float guard_timeout := 30.0, integer nr_msc := 1, integer nr_sgsn := 1) runs on test_CT { +function f_init(charstring id := "HNBGW", float guard_timeout := 30.0, integer nr_msc := 1, integer nr_sgsn := 1, + boolean start_hnb := true) runs on test_CT { T_guard.start(guard_timeout); activate(as_Tguard()); @@ -447,6 +448,10 @@ f_init_mgcp(id); f_init_vty("VirtHNBGW"); + + if (start_hnb) { + f_start_hnbs(); + } } friend function f_shutdown_helper() runs on test_CT { @@ -828,7 +833,7 @@ testcase TC_hnb_register() runs on test_CT { g_num_hnbs := 1; - f_init(); + f_init(start_hnb := false); f_hnbap_register(0); f_shutdown_helper(); } @@ -837,7 +842,7 @@ * one should be rejected. */ testcase TC_hnb_register_duplicate() runs on test_CT { g_num_hnbs := 2; - f_init(); + f_init(start_hnb := false); f_hnbap_register(0); f_hnbap_register(1, 0, expect_reject := true); f_verify_talloc_count(HNBGWVTY, {"struct hnb_context"}, expect_count := 1); @@ -849,7 +854,7 @@ * applied. TS 25.469 8.2.4 */ testcase TC_hnb_register_duplicate_reuse_sctp_assoc() runs on test_CT { g_num_hnbs := 1; - f_init(); + f_init(start_hnb := false); f_hnbap_register(0); f_hnbap_register(0); f_verify_talloc_count(HNBGWVTY, {"struct hnb_context"}, expect_count := 1); @@ -860,7 +865,7 @@ * Related: OS#5676, SYS#6113 */ testcase TC_hnb_reregister_reuse_sctp_assoc() runs on test_CT { g_num_hnbs := 1; - f_init(); + f_init(start_hnb := false); f_hnbap_register(0); HNBAP[0].send(ts_HNBAP_HNBDe_Register(ts_HnbapCause(unspecified))); f_hnbap_register(0); @@ -913,7 +918,6 @@ g_num_hnbs := 1; f_init(); - f_start_hnbs(); vc_conn := f_start_handler_with_pars(refers(f_tc_initial_ue), t_pars(1)); vc_conn.done; @@ -925,7 +929,6 @@ g_num_hnbs := 1; f_init(); - f_start_hnbs(); vc_conn := f_start_handler_with_pars(refers(f_tc_initial_ue), t_pars(2, true)); vc_conn.done; @@ -952,7 +955,6 @@ g_num_hnbs := 1; f_init(); - f_start_hnbs(); f_vty_set_sccp_max_optional_data(HNBGWVTY, 0); @@ -969,7 +971,6 @@ g_num_hnbs := 1; f_init(); - f_start_hnbs(); f_vty_set_sccp_max_optional_data(HNBGWVTY, 0); @@ -992,7 +993,6 @@ testcase TC_sccp_cr_limit() runs on test_CT { g_num_hnbs := 1; f_init(); - f_start_hnbs(); const Testdata_CR_Limits tests := { { data_len := 130, max_optional_data := -1, expect_separate_sccp_cr := false }, @@ -1250,7 +1250,6 @@ var ConnHdlr vc_conn; g_num_hnbs := 1; f_init(); - f_start_hnbs(); vc_conn := f_start_handler_with_pars(refers(f_tc_rab_assignment), t_pars(3)); vc_conn.done; @@ -1288,7 +1287,6 @@ var ConnHdlr vc_conn; g_num_hnbs := 1; f_init(); - f_start_hnbs(); vc_conn := f_start_handler_with_pars(refers(f_tc_rab_assign_fail), t_pars(4)); vc_conn.done; @@ -1330,7 +1328,6 @@ var ConnHdlr vc_conn; g_num_hnbs := 1; f_init(); - f_start_hnbs(); vc_conn := f_start_handler_with_pars(refers(f_tc_rab_release), t_pars(5)); vc_conn.done; @@ -1381,7 +1378,6 @@ var ConnHdlr vc_conn; g_num_hnbs := 1; f_init(); - f_start_hnbs(); vc_conn := f_start_handler_with_pars(refers(f_tc_rab_assign_mgcp_to), t_pars(6)); vc_conn.done; @@ -1408,7 +1404,6 @@ var ConnHdlr vc_conn; g_num_hnbs := 1; f_init(); - f_start_hnbs(); vc_conn := f_start_handler_with_pars(refers(f_tc_ranap_bidir), t_pars(3)); vc_conn.done; @@ -1419,7 +1414,6 @@ var ConnHdlr vc_conn; g_num_hnbs := 1; f_init(); - f_start_hnbs(); vc_conn := f_start_handler_with_pars(refers(f_tc_ranap_bidir), t_pars(4, true)); vc_conn.done; @@ -1446,7 +1440,6 @@ var ConnHdlr vc_conn; g_num_hnbs := 1; f_init(); - f_start_hnbs(); vc_conn := f_start_handler_with_pars(refers(f_tc_ranap_mo_disconnect), t_pars(5)); vc_conn.done; @@ -1457,7 +1450,6 @@ var ConnHdlr vc_conn; g_num_hnbs := 1; f_init(); - f_start_hnbs(); vc_conn := f_start_handler_with_pars(refers(f_tc_ranap_mo_disconnect), t_pars(6)); vc_conn.done; @@ -1626,7 +1618,6 @@ var ConnHdlr vc_conn; g_num_hnbs := 1; f_init(); - f_start_hnbs(); f_sleep(1.0); vc_conn := f_start_handler_with_pars(refers(f_tc_ps_rab_assignment_with_pfcp), t_pars(7, ps_domain := true)); @@ -1690,7 +1681,6 @@ testcase TC_ps_rab_assignment_without_pfcp() runs on test_CT { var ConnHdlr vc_conn; f_init(); - f_start_hnbs(); f_sleep(1.0); vc_conn := f_start_handler_with_pars(refers(f_tc_ps_rab_assignment_without_pfcp), t_pars(7, ps_domain := true)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33482 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2b29ce66aee0b2d57fa26e6110f06292c481ab6b Gerrit-Change-Number: 33482 Gerrit-PatchSet: 7 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: add CTRL port

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33484 ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: hnbgw: add CTRL port ...................................................................... hnbgw: add CTRL port Change-Id: I4c06e1fda135d87ce52151fd574f481cd414722f --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index f196e64..84d0b3a 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -79,6 +79,7 @@ /* IP address at which the test binds */ charstring mp_hnbgw_ip := "127.0.0.1"; integer mp_hnbgw_iuh_port := 29169; + integer mp_hnbgw_ctrl_port := 4262; charstring mp_mgw_ip := "127.0.0.1"; integer mp_mgw_port := 2427; @@ -430,6 +431,8 @@ f_init_hnodeb(testcasename(), i, rua_ops); } + f_ipa_ctrl_start_client(mp_hnbgw_ip, mp_hnbgw_ctrl_port); + /* MSC emulation */ var RanOps ranops := MSC_RanOps; for (var integer i := 0; i < nr_msc; i := i + 1) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33484 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4c06e1fda135d87ce52151fd574f481cd414722f Gerrit-Change-Number: 33484 Gerrit-PatchSet: 7 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: CN links: implement 'allow attach'

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33485 ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: hnbgw: CN links: implement 'allow attach' ...................................................................... hnbgw: CN links: implement 'allow attach' Prep for I027a059faed3f140f8801f84338956cd004043b5 Change-Id: I5c9db4b31298ca9855b4390481a709f863459172 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 89 insertions(+), 9 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 84d0b3a..92f93cf 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -408,6 +408,60 @@ vc_RUA[hnb_idx].start(RUA_Emulation.main(rua_ops, id & "-RUA")); } +private type record of boolean BooleanList; + +private function f_vty_cnlink_allow_attach(TELNETasp_PT pt, boolean ps_domain, BooleanList allow_attach_list) +{ + var charstring config := f_vty_transceive_ret(pt, "show running-config"); + + var charstring msc_sgsn; + if (ps_domain) { + msc_sgsn := "sgsn"; + } else { + msc_sgsn := "msc"; + } + + f_vty_enter_config(pt); + for (var integer cn_nr := 0; cn_nr < sizeof(allow_attach_list); cn_nr := cn_nr+1) { + if (f_strstr(config, "\n" & msc_sgsn & " " & int2str(cn_nr) & "\n") < 0) { + /* There is no 'msc N' for this cn_nr in the running config, so don't create an empty cn by + * stepping into that config node. */ + log(msc_sgsn, cn_nr, " is not configured, skipping"); + continue; + } + f_vty_transceive(pt, msc_sgsn & " " & int2str(cn_nr)); + + if (allow_attach_list[cn_nr]) { + /* strict := false: ignore if osmo-hnbgw does not support this config option (latest build) */ + f_vty_transceive(pt, "allow-attach", strict := false); + } else { + f_vty_transceive(pt, "no allow-attach", strict := false); + } + f_vty_transceive(pt, "exit"); + } + f_vty_transceive(pt, "exit"); +} + +/* Start RAN adapter for CN link N. + * e.g. link for 'msc 0' = (ps_domain := false, cn_nr := 0) + * link for 'sgsn 3' = (ps_domain := true, cn_nr := 3) + */ +private function f_cn_nr_init(boolean ps_domain, integer cn_nr) runs on test_CT { + var RanOps ranops := MSC_RanOps; + ranops.ps_domain := ps_domain; + var integer cn_idx := f_cn_idx(ps_domain, cn_nr); + var charstring msc_sgsn := "msc"; + if (ps_domain) { + msc_sgsn := "sgsn"; + } + f_ran_adapter_init(g_cn[cn_idx], mp_cn_cfg[cn_idx], "HNBGW_Test." & msc_sgsn & int2str(cn_nr), ranops); + f_ran_adapter_start(g_cn[cn_idx]); +} + +private function f_cn_idx_disconnect(integer cn_idx) runs on test_CT { + f_ran_adapter_cleanup(g_cn[cn_idx]); +} + /* global initialization function */ function f_init(charstring id := "HNBGW", float guard_timeout := 30.0, integer nr_msc := 1, integer nr_sgsn := 1, boolean start_hnb := true) runs on test_CT { @@ -431,26 +485,41 @@ f_init_hnodeb(testcasename(), i, rua_ops); } + f_init_vty("VirtHNBGW"); f_ipa_ctrl_start_client(mp_hnbgw_ip, mp_hnbgw_ctrl_port); /* MSC emulation */ - var RanOps ranops := MSC_RanOps; + + /* Make sure each MSC's internal state is "DISCONNECTED" at first */ + for (var integer i := 0; i < NUM_MSC; i := i + 1) { + f_vty_transceive(HNBGWVTY, "msc " & int2str(i) & " ranap reset", strict := false); + } + + var BooleanList allow_attach := { false, false, false, false }; for (var integer i := 0; i < nr_msc; i := i + 1) { var integer cn_idx := FIRST_MSC_IDX + i; - f_ran_adapter_init(g_cn[cn_idx], mp_cn_cfg[cn_idx], "HNBGW_Test", ranops); - f_ran_adapter_start(g_cn[cn_idx]); + allow_attach[i] := true; + f_cn_nr_init(ps_domain := false, cn_nr := i); } + /* start the test with exactly all enabled MSCs allowed to attach */ + f_vty_cnlink_allow_attach(HNBGWVTY, false, allow_attach); /* SGSN emulation */ - ranops.ps_domain := true; - for (var integer i := 0; i < nr_sgsn; i := i + 1) { - var integer cn_idx := FIRST_SGSN_IDX + i; - f_ran_adapter_init(g_cn[cn_idx], mp_cn_cfg[cn_idx], "HNBGW_Test", ranops); - f_ran_adapter_start(g_cn[cn_idx]); + + /* Make sure each SGSN's internal state is "DISCONNECTED" at first */ + for (var integer i := 0; i < NUM_SGSN; i := i + 1) { + f_vty_transceive(HNBGWVTY, "sgsn " & int2str(i) & " ranap reset", strict := false); } + allow_attach := { false, false, false, false }; + for (var integer i := 0; i < nr_sgsn; i := i + 1) { + var integer cn_idx := FIRST_SGSN_IDX + i; + allow_attach[i] := true; + f_cn_nr_init(ps_domain := true, cn_nr := i); + } + f_vty_cnlink_allow_attach(HNBGWVTY, true, allow_attach); + f_init_mgcp(id); - f_init_vty("VirtHNBGW"); if (start_hnb) { f_start_hnbs(); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5c9db4b31298ca9855b4390481a709f863459172 Gerrit-Change-Number: 33485 Gerrit-PatchSet: 7 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2023