NS_Emulation: support multiple instances at the same time
The NS_Emulation has configuration values hardcoded or bound
to module parameters which prevents multiple instances.
Replace the module parameter based configuration with configuration
given when starting the NS_Emaulation.
Change-Id: I9128f9ad5c372779c38799269393137ba52576cd
diff --git a/pcu/PCU_Tests.cfg b/pcu/PCU_Tests.cfg
index 20de54c..7e0b9f2 100644
--- a/pcu/PCU_Tests.cfg
+++ b/pcu/PCU_Tests.cfg
@@ -11,12 +11,15 @@
#mp_local_udp_port := 23000
#mp_remote_ip := "192.168.100.196"
#mp_remote_udp_port := 21000
-NS_Emulation.mp_local_ip := "127.0.0.1"
-NS_Emulation.mp_local_udp_port := 23000
-NS_Emulation.mp_remote_ip := "127.0.0.1"
-NS_Emulation.mp_remote_udp_port := 23001
-NS_Emulation.mp_nsei := 1234
-NS_Emulation.mp_nsvci := 1234
+PCU_Tests.mp_nsconfig := {
+ local_ip := "127.0.0.1",
+ local_udp_port := 23000,
+ remote_ip := "127.0.0.1",
+ remote_udp_port := 23001,
+ nsvci := 1234,
+ nsei := 1234
+}
+
PCU_Tests.mp_gb_cfg := {
nsei := 1234,
bvci := 1234,
diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index dfd380d..d59ac11 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -33,6 +33,15 @@
},
sgsn_role := true
};
+
+ 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
+ };
}
type component dummy_CT extends BSSGP_Client_CT {
@@ -66,7 +75,7 @@
connect(bssgp_component:BSCP, ns_component:NS_SP);
/* connect lower-end of NS emulation to NS_CODEC_PORT (on top of IPl4) */
map(ns_component:NSCP, system:NS_CODEC_PORT);
- ns_component.start(NSStart());
+ ns_component.start(NSStart(mp_nsconfig));
bssgp_component.start(BssgpStart(mp_gb_cfg));
lapdm_component := lapdm_CT.create;