laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33236 )

Change subject: Explicitly configure ASPs asp-clnt-* as role=asp & sctp-role=client ......................................................................

Explicitly configure ASPs asp-clnt-* as role=asp & sctp-role=client

Until recently, the asp-clnt-* ASPs, which have specific handling in osmo_sccp_simple_client_on_ss7_id(), were being always forcedly set to sctp-role CLIENT by code in that function. This prevented user of that API from explicitly configuring the ASP as "sctp-role server" through the VTY as the option would be overwritten silently.

Now, the sctp-role from config is followed if the ASP is defined/configured through the VTY (not dynamically created at the time osmo_sccp_simple_client_on_ss7_id() is called).

Since the default for a VTY-specified ASP is to be in "sctp-role server", the config files need to be updated to properly configure the ASP to be in "sctp-role client", which is the desired mode here.

Same applies for "role", where the default is SG but it is actually used as "ASP" here.

Change-Id: I4eb5b5f6b4b24df079b4c74e2a2e2ebb8769b0bd --- M bsc/osmo-bsc-sccplite.cfg M bsc/osmo-bsc-vamos.cfg M bsc/osmo-bsc.cfg M bts/osmo-bsc.cfg M msc/osmo-msc.cfg M sgsn/osmo-sgsn.cfg M sgsn/osmo-sgsn.sns.cfg M smlc/osmo-smlc.cfg 8 files changed, 42 insertions(+), 1 deletion(-)

Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved

diff --git a/bsc/osmo-bsc-sccplite.cfg b/bsc/osmo-bsc-sccplite.cfg index 4a3498b..05934ed 100644 --- a/bsc/osmo-bsc-sccplite.cfg +++ b/bsc/osmo-bsc-sccplite.cfg @@ -25,6 +25,8 @@ point-code 0.23.3 asp asp-clnt-msc-0 5000 0 ipa remote-ip 127.0.0.1 + role asp + sctp-role client as as-clnt-msc-0 ipa asp asp-clnt-msc-0 routing-key 0 0.23.3 diff --git a/bsc/osmo-bsc-vamos.cfg b/bsc/osmo-bsc-vamos.cfg index 4b0389f..73cafe7 100644 --- a/bsc/osmo-bsc-vamos.cfg +++ b/bsc/osmo-bsc-vamos.cfg @@ -49,6 +49,8 @@ cs7 instance 0 asp asp-clnt-msc-0 2905 1905 m3ua remote-ip 127.0.0.1 + role asp + sctp-role client sccp-address msc2 point-code 0.0.2 sccp-address msc3 diff --git a/bsc/osmo-bsc.cfg b/bsc/osmo-bsc.cfg index bb62f52..43f7833 100644 --- a/bsc/osmo-bsc.cfg +++ b/bsc/osmo-bsc.cfg @@ -49,6 +49,8 @@ cs7 instance 0 asp asp-clnt-msc-0 2905 1905 m3ua remote-ip 127.0.0.1 + role asp + sctp-role client sccp-address msc2 point-code 0.0.2 sccp-address msc3 diff --git a/bts/osmo-bsc.cfg b/bts/osmo-bsc.cfg index 8f3169b..967e265 100644 --- a/bts/osmo-bsc.cfg +++ b/bts/osmo-bsc.cfg @@ -40,6 +40,8 @@ cs7 instance 0 point-code 0.23.3 asp asp-clnt-msc-0 2905 0 m3ua + role asp + sctp-role client as as-clnt-msc-0 m3ua asp asp-clnt-msc-0 routing-key 2 0.23.3 diff --git a/msc/osmo-msc.cfg b/msc/osmo-msc.cfg index 1adb0e9..a266ed4 100644 --- a/msc/osmo-msc.cfg +++ b/msc/osmo-msc.cfg @@ -42,6 +42,8 @@ point-code 0.23.1 asp asp-clnt-OsmoMSC-A 2905 0 m3ua remote-ip 127.0.0.1 + role asp + sctp-role client as as-clnt-OsmoMSC-A m3ua asp asp-clnt-OsmoMSC-A routing-key 3 0.23.1 diff --git a/sgsn/osmo-sgsn.cfg b/sgsn/osmo-sgsn.cfg index 7941007..b446f87 100644 --- a/sgsn/osmo-sgsn.cfg +++ b/sgsn/osmo-sgsn.cfg @@ -58,6 +58,8 @@ point-code 0.23.4 asp asp-clnt-OsmoSGSN-A 2905 0 m3ua remote-ip 127.0.0.200 + role asp + sctp-role client as as-clnt-OsmoSGSN-A m3ua asp asp-clnt-OsmoSGSN-A routing-key 3 0.23.4 diff --git a/sgsn/osmo-sgsn.sns.cfg b/sgsn/osmo-sgsn.sns.cfg index 988790a..5d09b1b 100644 --- a/sgsn/osmo-sgsn.sns.cfg +++ b/sgsn/osmo-sgsn.sns.cfg @@ -58,6 +58,8 @@ point-code 0.23.4 asp asp-clnt-OsmoSGSN-A 2905 0 m3ua remote-ip 127.0.0.200 + role asp + sctp-role client as as-clnt-OsmoSGSN-A m3ua asp asp-clnt-OsmoSGSN-A routing-key 3 0.23.4 diff --git a/smlc/osmo-smlc.cfg b/smlc/osmo-smlc.cfg index 3bba0b3..7da2163 100644 --- a/smlc/osmo-smlc.cfg +++ b/smlc/osmo-smlc.cfg @@ -21,7 +21,8 @@ local-ip fd02:db8:23::20 remote-ip 172.18.23.200 remote-ip fd02:db8:23::200 - + role asp + sctp-role client cells lac-ci 23 42 lat 23.23 lon 42.42 cgi 001 02 3 4 lat 5.678 lon 6.789