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

neels has uploaded this change for review. ( 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'. Related: 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, 388 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/68/33668/1 diff --git a/ttcn3-hnbgw-test/jenkins.sh b/ttcn3-hnbgw-test/jenkins.sh index e93c8af..8d8f29f 100755 --- a/ttcn3-hnbgw-test/jenkins.sh +++ b/ttcn3-hnbgw-test/jenkins.sh @@ -78,9 +78,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..02d96a8 100644 --- a/ttcn3-hnbgw-test/osmo-stp.cfg +++ b/ttcn3-hnbgw-test/osmo-stp.cfg @@ -39,6 +39,21 @@ 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 + 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 + 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 +63,26 @@ 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 + 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 + 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: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange