summaryrefslogtreecommitdiffstats
path: root/sgsn
diff options
context:
space:
mode:
authorAlexander Couzens <lynxis@fe80.eu>2018-08-24 00:42:51 +0200
committerAlexander Couzens <lynxis@fe80.eu>2018-08-28 14:27:08 +0200
commitf3c1b41fe42b4f0fa5464f3a992ea61bebdb0a58 (patch)
tree21a7f88b3b7c24c4e70701bf69f37912684686bb /sgsn
parent3bf31d216a18c1d6a6e298a592f873beea322939 (diff)
sgsn: don't re-use the same NS for all 3 BSSGP
Create for every BSSGP a new NS instance. Change-Id: I3448fe837eaa8efab65dccc32bacaaacd73a2f09
Diffstat (limited to 'sgsn')
-rw-r--r--sgsn/SGSN_Tests.default6
-rw-r--r--sgsn/SGSN_Tests.ttcn35
2 files changed, 27 insertions, 14 deletions
diff --git a/sgsn/SGSN_Tests.default b/sgsn/SGSN_Tests.default
index 82682e2..e44e234 100644
--- a/sgsn/SGSN_Tests.default
+++ b/sgsn/SGSN_Tests.default
@@ -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]
diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index 715bdcc..82c37f2 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -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));
}