bts: Pass defaults config name at construct time
It will be needed later at construction time when resolving the num of
trx.
Change-Id: I2c6a46ead14010f714897ea178917327215823e7
diff --git a/src/osmo_gsm_tester/bts_osmo.py b/src/osmo_gsm_tester/bts_osmo.py
index d0ba557..8629b9b 100644
--- a/src/osmo_gsm_tester/bts_osmo.py
+++ b/src/osmo_gsm_tester/bts_osmo.py
@@ -30,14 +30,14 @@
##############
# PROTECTED
##############
- def __init__(self, suite_run, conf, name):
- super().__init__(suite_run, conf, name)
+ def __init__(self, suite_run, conf, name, defaults_cfg_name):
+ super().__init__(suite_run, conf, name, defaults_cfg_name)
if len(self.pcu_socket_path().encode()) > 107:
raise log.Error('Path for pcu socket is longer than max allowed len for unix socket path (107):', self.pcu_socket_path())
- def conf_for_bsc_osmo(self, bts_defaults_name):
+ def conf_for_bsc_prepare(self):
values = config.get_defaults('bsc_bts')
- config.overlay(values, config.get_defaults(bts_defaults_name))
+ config.overlay(values, config.get_defaults(self.defaults_cfg_name))
if self.lac is not None:
config.overlay(values, { 'location_area_code': self.lac })
if self.rac is not None:
@@ -94,8 +94,8 @@
##############
pcu_sk_tmp_dir = None
- def __init__(self, suite_run, conf, name):
- super().__init__(suite_run, conf, name)
+ def __init__(self, suite_run, conf, name, defaults_cfg_name):
+ super().__init__(suite_run, conf, name, defaults_cfg_name)
########################
# PUBLIC - INTERNAL API