sysmocom: Port nitb_netreg_mass suite to osmo split network
Change-Id: I221df84d76f73e15eed98036b31adc8089c8dc99
diff --git a/sysmocom/suites/nitb_netreg_mass/register_default_mass.py b/sysmocom/suites/netreg_mass/register_default_mass.py
similarity index 83%
rename from sysmocom/suites/nitb_netreg_mass/register_default_mass.py
rename to sysmocom/suites/netreg_mass/register_default_mass.py
index f6b94ad..ed41186 100644
--- a/sysmocom/suites/nitb_netreg_mass/register_default_mass.py
+++ b/sysmocom/suites/netreg_mass/register_default_mass.py
@@ -7,21 +7,32 @@
from datetime import timedelta
print('Claiming resources for the test')
-nitb = tenv.nitb()
+hlr = tenv.hlr()
+mgw_msc = tenv.mgw()
+mgw_bsc = tenv.mgw()
+stp = tenv.stp()
+msc = tenv.msc(hlr, mgw_msc, stp)
+bsc = tenv.bsc(msc, mgw_bsc, stp)
bts = tenv.bts()
ms_driver = tenv.ms_driver()
ul = ms_driver.add_test('ul_test')
modems = tenv.all_resources(tenv.modem)
print('Launching a simple network')
-nitb.bts_add(bts)
-nitb.start()
+hlr.start()
+stp.start()
+msc.start()
+mgw_msc.start()
+mgw_bsc.start()
+
+bsc.bts_add(bts)
+bsc.start()
bts.start()
-wait(nitb.bts_is_connected, bts)
+wait(bsc.bts_is_connected, bts)
# Configure all MS that are available to this test.
for modem in modems:
- nitb.subscriber_add(modem)
+ hlr.subscriber_add(modem)
ms_driver.subscriber_add(modem)
# Run the base test.
diff --git a/sysmocom/suites/nitb_netreg_mass/suite.conf b/sysmocom/suites/netreg_mass/suite.conf
similarity index 71%
rename from sysmocom/suites/nitb_netreg_mass/suite.conf
rename to sysmocom/suites/netreg_mass/suite.conf
index 90e9946..68c43b7 100644
--- a/sysmocom/suites/nitb_netreg_mass/suite.conf
+++ b/sysmocom/suites/netreg_mass/suite.conf
@@ -1,9 +1,8 @@
resources:
ip_address:
- - times: 1
+ - times: 6 # msc, bsc, hlr, stp, mgw*2
bts:
- type: osmo-bts-virtual
modem:
- times: 100
type: osmo-mobile
-