sgsn: don't re-use the same NS for all 3 BSSGP

Create for every BSSGP a new NS instance.

Change-Id: I3448fe837eaa8efab65dccc32bacaaacd73a2f09
This commit is contained in:
Alexander Couzens 2018-08-24 00:42:51 +02:00
parent 3bf31d216a
commit f3c1b41fe4
2 changed files with 27 additions and 14 deletions

View File

@ -20,12 +20,6 @@ FileMask := LOG_ALL | TTCN_MATCHING;
[MODULE_PARAMETERS]
SGSN_Tests.mp_nsconfig := {
local_udp_port := 21000,
remote_udp_port := 23000,
nsvci := 97,
nsei := 96
}
Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoSGSN";
[MAIN_CONTROLLER]

View File

@ -44,13 +44,31 @@ modulepar {
integer mp_hlr_port := 4222;
charstring mp_ggsn_ip := "127.0.0.2";
NSConfiguration mp_nsconfig := {
local_udp_port := 23000,
local_ip := "127.0.0.1",
remote_udp_port := 21000,
remote_ip := "127.0.0.1",
nsvci := 0,
nsei := 2342
NSConfigurations mp_nsconfig := {
{
local_udp_port := 21010,
local_ip := "127.0.0.1",
remote_udp_port := 23000,
remote_ip := "127.0.0.1",
nsvci := 97,
nsei := 96
},
{
local_udp_port := 21011,
local_ip := "127.0.0.1",
remote_udp_port := 23000,
remote_ip := "127.0.0.1",
nsvci := 98,
nsei := 97
},
{
local_udp_port := 21012,
local_ip := "127.0.0.1",
remote_udp_port := 23000,
remote_ip := "127.0.0.1",
nsvci := 99,
nsei := 98
}
};
};
@ -61,6 +79,7 @@ type record GbInstance {
};
type record length(3) of GbInstance GbInstances;
type record length(3) of NSConfiguration NSConfigurations;
type record length(3) of BssgpCellId BssgpCellIds;
type component test_CT {
@ -135,7 +154,7 @@ private function f_init_gb(inout GbInstance gb, charstring id, integer offset) r
/* connect lower end of NS emulation to NS codec port (on top of IPL4) */
map(gb.vc_NS:NSCP, system:NS_CODEC_PORT);
gb.vc_NS.start(NSStart(mp_nsconfig));
gb.vc_NS.start(NSStart(mp_nsconfig[offset]));
gb.vc_BSSGP.start(BssgpStart(gb.cfg));
}