diff options
author | Alexander Couzens <lynxis@fe80.eu> | 2018-07-31 00:30:11 +0200 |
---|---|---|
committer | lynxis lazus <lynxis@fe80.eu> | 2018-08-13 16:23:50 +0000 |
commit | 2c12b24a47dbabd6269b6dd4ffde066fcca6c2ed (patch) | |
tree | 7d65e5686cb803fe5867bdf7d5a0d5c799129d4d /pcu | |
parent | f4ac4cea516f22f9a229b3ba109bdfebf5019e7c (diff) |
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
Diffstat (limited to 'pcu')
-rw-r--r-- | pcu/PCU_Tests.cfg | 15 | ||||
-rw-r--r-- | pcu/PCU_Tests.ttcn | 11 |
2 files changed, 19 insertions, 7 deletions
diff --git a/pcu/PCU_Tests.cfg b/pcu/PCU_Tests.cfg index 20de54c9..7e0b9f28 100644 --- a/pcu/PCU_Tests.cfg +++ b/pcu/PCU_Tests.cfg @@ -11,12 +11,15 @@ ConsoleMask := ERROR | WARNING | TESTCASE | TIMEROP_START | DEBUG_ENCDEC #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 dfd380d8..d59ac110 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -33,6 +33,15 @@ module PCU_Tests { }, 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 @@ module PCU_Tests { 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; |