pespin has uploaded this change for review.
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: Idf84502ffa199926a5f0ee616313b515743811ab
Depends: osmo-ttcn3-hacks.git Change-Id I4eb5b5f6b4b24df079b4c74e2a2e2ebb8769b0bd
---
M osmo-cn-latest/osmo-msc.cfg
M osmo-cn-latest/osmo-msc.cfg.base
M osmo-hnbgw-latest/osmo-hnbgw.cfg
M osmo-hnbgw-master/osmo-hnbgw.cfg
M ttcn3-bsc-test-vamos/osmo-bsc.cfg
M ttcn3-bsc-test/osmo-bsc.cfg
M ttcn3-bsc-test/sccplite/osmo-bsc.cfg
M ttcn3-hnbgw-test/osmo-hnbgw.cfg
M ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg
M ttcn3-msc-test/osmo-msc.cfg
M ttcn3-sgsn-test/osmo-sgsn.cfg
M ttcn3-smlc-test/osmo-smlc.cfg
12 files changed, 51 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/39/33239/1
diff --git a/osmo-cn-latest/osmo-msc.cfg b/osmo-cn-latest/osmo-msc.cfg
index c7649fc..15a25aa 100644
--- a/osmo-cn-latest/osmo-msc.cfg
+++ b/osmo-cn-latest/osmo-msc.cfg
@@ -15,6 +15,8 @@
cs7 instance 0
asp asp-clnt-OsmoMSC-A-Iu 2905 2904 m3ua
remote-ip 192.168.42.10
+ role asp
+ sctp-role client
network
network country code 901
mobile network code 99
diff --git a/osmo-cn-latest/osmo-msc.cfg.base b/osmo-cn-latest/osmo-msc.cfg.base
index da61a49..8f1b0c1 100644
--- a/osmo-cn-latest/osmo-msc.cfg.base
+++ b/osmo-cn-latest/osmo-msc.cfg.base
@@ -15,6 +15,8 @@
cs7 instance 0
asp asp-clnt-OsmoMSC-A-Iu 2905 2904 m3ua
remote-ip 192.168.42.10
+ role asp
+ sctp-role client
network
network country code 901
mobile network code 1
diff --git a/osmo-hnbgw-latest/osmo-hnbgw.cfg b/osmo-hnbgw-latest/osmo-hnbgw.cfg
index 8bffd76..36c8f8c 100644
--- a/osmo-hnbgw-latest/osmo-hnbgw.cfg
+++ b/osmo-hnbgw-latest/osmo-hnbgw.cfg
@@ -23,6 +23,8 @@
point-code 0.23.5
asp asp-clnt-OsmoHNBGW 2905 0 m3ua
remote-ip 172.18.0.200
+ role asp
+ sctp-role client
sccp-address msc
point-code 0.23.2
sccp-address sgsn
diff --git a/osmo-hnbgw-master/osmo-hnbgw.cfg b/osmo-hnbgw-master/osmo-hnbgw.cfg
index 5608e3e..3c6fa98 100644
--- a/osmo-hnbgw-master/osmo-hnbgw.cfg
+++ b/osmo-hnbgw-master/osmo-hnbgw.cfg
@@ -26,6 +26,8 @@
point-code 0.23.5
asp asp-clnt-OsmoHNBGW 2905 0 m3ua
remote-ip 172.18.0.200
+ role asp
+ sctp-role client
sccp-address msc
point-code 0.23.2
sccp-address sgsn
diff --git a/ttcn3-bsc-test-vamos/osmo-bsc.cfg b/ttcn3-bsc-test-vamos/osmo-bsc.cfg
index bf339fa..98f1304 100644
--- a/ttcn3-bsc-test-vamos/osmo-bsc.cfg
+++ b/ttcn3-bsc-test-vamos/osmo-bsc.cfg
@@ -58,6 +58,8 @@
local-ip fd02:db8:31::20
remote-ip 172.18.31.200
remote-ip fd02:db8:31::200
+ role asp
+ sctp-role client
sccp-address msc2
point-code 0.0.2
sccp-address msc3
diff --git a/ttcn3-bsc-test/osmo-bsc.cfg b/ttcn3-bsc-test/osmo-bsc.cfg
index ef7ffae..5902b1d 100644
--- a/ttcn3-bsc-test/osmo-bsc.cfg
+++ b/ttcn3-bsc-test/osmo-bsc.cfg
@@ -68,6 +68,8 @@
local-ip fd02:db8:2::20
remote-ip 172.18.2.200
remote-ip fd02:db8:2::200
+ role asp
+ sctp-role client
sccp-address msc2
point-code 0.0.2
sccp-address msc3
diff --git a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg
index c680ef7..423f6d9 100644
--- a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg
+++ b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg
@@ -57,6 +57,8 @@
asp asp-clnt-msc-0 5000 0 ipa
local-ip 172.18.12.20
remote-ip 172.18.12.203
+ 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/ttcn3-hnbgw-test/osmo-hnbgw.cfg b/ttcn3-hnbgw-test/osmo-hnbgw.cfg
index e116c79..61d6236 100644
--- a/ttcn3-hnbgw-test/osmo-hnbgw.cfg
+++ b/ttcn3-hnbgw-test/osmo-hnbgw.cfg
@@ -24,6 +24,8 @@
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
diff --git a/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg b/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg
index ce8e673..329ea7d 100644
--- a/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg
+++ b/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg
@@ -24,6 +24,8 @@
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
diff --git a/ttcn3-msc-test/osmo-msc.cfg b/ttcn3-msc-test/osmo-msc.cfg
index 903b5bd..dabf142 100644
--- a/ttcn3-msc-test/osmo-msc.cfg
+++ b/ttcn3-msc-test/osmo-msc.cfg
@@ -61,6 +61,8 @@
local-ip fd02:db8:20::10
remote-ip 172.18.20.200
remote-ip fd02:db8:20::200
+ 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/ttcn3-sgsn-test/osmo-sgsn.cfg b/ttcn3-sgsn-test/osmo-sgsn.cfg
index 73d55e7..0fb826a 100644
--- a/ttcn3-sgsn-test/osmo-sgsn.cfg
+++ b/ttcn3-sgsn-test/osmo-sgsn.cfg
@@ -57,6 +57,8 @@
local-ip fd02:db8:8::10
remote-ip 172.18.8.200
remote-ip fd02:db8:8::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/ttcn3-smlc-test/osmo-smlc.cfg b/ttcn3-smlc-test/osmo-smlc.cfg
index 3bba0b3..7da2163 100644
--- a/ttcn3-smlc-test/osmo-smlc.cfg
+++ b/ttcn3-smlc-test/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
To view, visit change 33239. To unsubscribe, or for help writing mail filters, visit settings.