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
This commit is contained in:
Neels Hofmeyr 2023-05-24 23:56:06 +02:00
parent 9901316371
commit a49b265226
7 changed files with 75 additions and 20 deletions

View File

@ -11,10 +11,10 @@ hnbgw
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

12
tests/config/legacy.cfg Normal file
View File

@ -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

47
tests/config/legacy.vty Normal file
View File

@ -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
...

View File

@ -5,8 +5,7 @@ cs7 instance 0
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

View File

@ -3,6 +3,5 @@ cs7 instance 0
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

View File

@ -3,6 +3,5 @@ cs7 instance 0
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

View File

@ -10,8 +10,7 @@ cs7 instance 1
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