Change in osmo-ttcn3-hacks[master]: sgsn: don't re-use the same NS for all 3 BSSGP

[lynxis lazus]

lynxis lazus has submitted this change and it was merged. ( https://gerrit.osmocom.org/10649 )

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

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

Create for every BSSGP a new NS instance.

Change-Id: I3448fe837eaa8efab65dccc32bacaaacd73a2f09
---
M sgsn/SGSN_Tests.default
M sgsn/SGSN_Tests.ttcn
2 files changed, 27 insertions(+), 14 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Stefan Sperling: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved



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 @@
 
 
 [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 @@
 	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 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 @@
 	/* 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));
 }
 

-- 
To view, visit https://gerrit.osmocom.org/10649
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I3448fe837eaa8efab65dccc32bacaaacd73a2f09
Gerrit-Change-Number: 10649
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus <lynxis at fe80.eu>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Stefan Sperling <ssperling at sysmocom.de>
Gerrit-Reviewer: daniel <dwillmann at sysmocom.de>
Gerrit-Reviewer: lynxis lazus <lynxis at fe80.eu>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180828/395c080c/attachment.htm>