neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/33129 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: cnpool: examples and config tests: use 'msc 0'/'sgsn 0' syntax ...................................................................... cnpool: examples and config tests: use 'msc 0'/'sgsn 0' syntax After recent introduction of multiple 'msc' and 'sgsn' nodes in the VTY config, switch cfg files to the new syntax: - in doc/examples - for 'make config-tests' - have one test in old config syntax to test backwards compat: 'legacy', an exact copy of 'one_cs7_with_addrs'. Related: SYS#6412 Change-Id: If999b71a8a8237699f6ccfcaa31d1885e66c0518 --- M doc/examples/osmo-hnbgw/osmo-hnbgw-cs7.cfg A tests/config/legacy.cfg A tests/config/legacy.vty M tests/config/one_cs7_with_addrs.cfg M tests/config/one_cs7_with_iucs_addr.cfg M tests/config/one_cs7_with_iups_addr.cfg M tests/config/two_cs7_with_addrs.cfg 7 files changed, 92 insertions(+), 20 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/examples/osmo-hnbgw/osmo-hnbgw-cs7.cfg b/doc/examples/osmo-hnbgw/osmo-hnbgw-cs7.cfg index 5e78947..daf0668 100644 --- a/doc/examples/osmo-hnbgw/osmo-hnbgw-cs7.cfg +++ b/doc/examples/osmo-hnbgw/osmo-hnbgw-cs7.cfg @@ -11,10 +11,10 @@ iuh local-ip 0.0.0.0 hnbap-allow-tmsi 1 - iucs - remote-addr my-msc - iups - remote-addr my-sgsn +msc 0 + remote-addr my-msc +sgsn 0 + remote-addr my-sgsn log stderr logging filter all 1 diff --git a/tests/config/legacy.cfg b/tests/config/legacy.cfg new file mode 100644 index 0000000..0369bd4 --- /dev/null +++ b/tests/config/legacy.cfg @@ -0,0 +1,12 @@ +# explicitly point at cs7 instance 0 via two address book entries for CS and PS. Leave ASP and AS to auto-configuration. +cs7 instance 0 + point-code 1.1.1 + sccp-address my-msc + point-code 1.2.3 + sccp-address my-sgsn + point-code 1.4.2 +hnbgw + iucs + remote-addr my-msc + iups + remote-addr my-sgsn diff --git a/tests/config/legacy.vty b/tests/config/legacy.vty new file mode 100644 index 0000000..4df44a5 --- /dev/null +++ b/tests/config/legacy.vty @@ -0,0 +1,47 @@ +OsmoHNBGW> enable + +OsmoHNBGW# ### ASP and AS were auto-configured +OsmoHNBGW# show cs7 config +cs7 instance 0 + point-code 1.1.1 + asp asp-clnt-msc-0 2905 0 m3ua + local-ip localhost + remote-ip localhost + sctp-role client + as as-clnt-msc-0 m3ua + asp asp-clnt-msc-0 + routing-key 0 1.1.1 + sccp-address my-msc + routing-indicator PC + point-code 1.2.3 + sccp-address my-sgsn + routing-indicator PC + point-code 1.4.2 + +OsmoHNBGW# ### IuCS and IuPS were explicitly pointed to specific remote point-codes, using cs7 instance 0 addresses +OsmoHNBGW# show cnlink +IuCS: OsmoHNBGW:RI=SSN_PC,PC=1.1.1,SSN=RANAP <-> my-msc=RI=SSN_PC,PC=1.2.3,SSN=RANAP + SS7 route: pc=0=0.0.0 mask=0x0=0.0.0 via AS as-clnt-msc-0 proto=m3ua ASP asp-clnt-msc-0 +IuPS: OsmoHNBGW:RI=SSN_PC,PC=1.1.1,SSN=RANAP <-> my-sgsn=RI=SSN_PC,PC=1.4.2,SSN=RANAP + SS7 route: pc=0=0.0.0 mask=0x0=0.0.0 via AS as-clnt-msc-0 proto=m3ua ASP asp-clnt-msc-0 + +OsmoHNBGW# show running-config +... +cs7 instance 0 + point-code 1.1.1 + sccp-address my-msc + routing-indicator PC + point-code 1.2.3 + sccp-address my-sgsn + routing-indicator PC + point-code 1.4.2 +hnbgw + rnc-id 23 + log-prefix hnb-id + iuh +... +msc 0 + remote-addr my-msc +sgsn 0 + remote-addr my-sgsn +... diff --git a/tests/config/one_cs7_with_addrs.cfg b/tests/config/one_cs7_with_addrs.cfg index 0369bd4..5075bfd 100644 --- a/tests/config/one_cs7_with_addrs.cfg +++ b/tests/config/one_cs7_with_addrs.cfg @@ -5,8 +5,7 @@ point-code 1.2.3 sccp-address my-sgsn point-code 1.4.2 -hnbgw - iucs - remote-addr my-msc - iups - remote-addr my-sgsn +msc 0 + remote-addr my-msc +sgsn 0 + remote-addr my-sgsn diff --git a/tests/config/one_cs7_with_iucs_addr.cfg b/tests/config/one_cs7_with_iucs_addr.cfg index 9e0207e..406243f 100644 --- a/tests/config/one_cs7_with_iucs_addr.cfg +++ b/tests/config/one_cs7_with_iucs_addr.cfg @@ -3,6 +3,5 @@ point-code 1.1.1 sccp-address my-msc point-code 1.2.3 -hnbgw - iucs - remote-addr my-msc +msc 0 + remote-addr my-msc diff --git a/tests/config/one_cs7_with_iups_addr.cfg b/tests/config/one_cs7_with_iups_addr.cfg index 96e7afa..8684870 100644 --- a/tests/config/one_cs7_with_iups_addr.cfg +++ b/tests/config/one_cs7_with_iups_addr.cfg @@ -3,6 +3,5 @@ point-code 1.1.1 sccp-address my-sgsn point-code 1.4.2 -hnbgw - iups - remote-addr my-sgsn +sgsn 0 + remote-addr my-sgsn diff --git a/tests/config/two_cs7_with_addrs.cfg b/tests/config/two_cs7_with_addrs.cfg index 57f13e3..2249e8f 100644 --- a/tests/config/two_cs7_with_addrs.cfg +++ b/tests/config/two_cs7_with_addrs.cfg @@ -10,8 +10,7 @@ sccp-address my-sgsn point-code 2.4.2 -hnbgw - iucs - remote-addr my-msc - iups - remote-addr my-sgsn +msc 0 + remote-addr my-msc +sgsn 0 + remote-addr my-sgsn -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/33129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: If999b71a8a8237699f6ccfcaa31d1885e66c0518 Gerrit-Change-Number: 33129 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> Gerrit-Reviewer: pespin <pespin@sysmocom.de> Gerrit-MessageType: merged