osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37705?usp=email ) Change subject: smlc: import current configs from docker-playground ...................................................................... smlc: import current configs from docker-playground Import the current configs, replacing the IPs used with 127.0.0.x. Before this patch, attempting to run the testsuite without containers fails because of the wrong IP range: 20240718122103706 DLGLOBAL NOTICE unable to bind socket: (172.18.23.20|fd02:db8:23::20):2905: Cannot assign requested address (socket.c:1042) Change-Id: I3ed9e971daf32458bc554fa0a7f4698b4a461bfa --- M smlc/SMLC_Tests.cfg M smlc/osmo-smlc.cfg M smlc/osmo-stp.cfg 3 files changed, 46 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/05/37705/1 diff --git a/smlc/SMLC_Tests.cfg b/smlc/SMLC_Tests.cfg index cc9fd6e..f1a7001 100644 --- a/smlc/SMLC_Tests.cfg +++ b/smlc/SMLC_Tests.cfg @@ -7,10 +7,27 @@ # Local configuration below [LOGGING] +*.JUnitLogger.testsuite_name := "SMLC_Tests" [TESTPORT_PARAMETERS] +*.SMLCVTY.CTRL_HOSTNAME := "127.0.0.20" +*.STATSVTY.CTRL_HOSTNAME := "127.0.0.20" [MODULE_PARAMETERS] +SMLC_Tests.mp_smlc_ip := "127.0.0.20"; +SMLC_Tests.mp_test_ip := "127.0.0.203"; +SMLC_Tests.mp_bssap_le_cfg := { + { + sccp_service_type := "mtp3_itu", + sctp_addr := { 23905, "127.0.0.203", 2905, "127.0.0.200" }, + own_pc := 187, /* 0.23.3 first BSC emulation */ + own_ssn := 250, /* BSC side SSN */ + peer_pc := 190, /* 0.23.6 osmo-smlc */ + peer_ssn := 252, /* SMLC side SSN */ + sio := '83'O, + rctx := 1 + } +}; [MAIN_CONTROLLER] diff --git a/smlc/osmo-smlc.cfg b/smlc/osmo-smlc.cfg index 7da2163..ffc5a4f 100644 --- a/smlc/osmo-smlc.cfg +++ b/smlc/osmo-smlc.cfg @@ -1,4 +1,4 @@ -log gsmtap 172.18.23.203 +log gsmtap 127.0.0.203 logging level set-all debug logging filter all 1 log stderr @@ -17,10 +17,8 @@ cs7 instance 0 asp asp-clnt-msc-0 2905 2905 m3ua - local-ip 172.18.23.20 - local-ip fd02:db8:23::20 - remote-ip 172.18.23.200 - remote-ip fd02:db8:23::200 + local-ip 127.0.0.20 + remote-ip 127.0.0.200 role asp sctp-role client cells diff --git a/smlc/osmo-stp.cfg b/smlc/osmo-stp.cfg index e2568e2..f1491a7 100644 --- a/smlc/osmo-stp.cfg +++ b/smlc/osmo-stp.cfg @@ -2,29 +2,23 @@ ! OsmoSTP (0.8.1) configuration saved from vty !! ! +log gsmtap 127.0.0.203 + logging level set-all debug + logging filter all 1 +! log stderr logging filter all 1 logging color 1 + logging print level 1 logging print category 1 - logging timestamp 1 + logging print category-hex 0 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 print file basename last + logging level set-all 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 @@ -32,8 +26,8 @@ cs7 instance 0 xua rkm routing-key-allocation dynamic-permitted asp virt-bsc0-0 23905 2905 m3ua - local-ip 127.0.0.1 - remote-ip 127.0.0.1 + local-ip 127.0.0.200 + remote-ip 127.0.0.203 role sg sctp-role server as virt-bsc0 m3ua @@ -44,3 +38,4 @@ update route 0.23.3 7.255.7 linkset virt-bsc0 listen m3ua 2905 accept-asp-connections dynamic-permitted + local-ip 127.0.0.200 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37705?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3ed9e971daf32458bc554fa0a7f4698b4a461bfa Gerrit-Change-Number: 37705 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange