This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Pau Espin Pedrol gerrit-no-reply at lists.osmocom.orgPau Espin Pedrol has submitted this change and it was merged. Change subject: bts: Move conf_for_bsc_prepare from bts_osmo to bts ...................................................................... bts: Move conf_for_bsc_prepare from bts_osmo to bts nanobts inherits directly from bts.Bts, so we need to move conf_for_bsc_prepare there to make nanobts work again. Fixes: 530681fd86c4a4dab18e4575c9cdf339623ffa49 Change-Id: I4305eefb4056ed7614118532e271efe780f4a87f --- M src/osmo_gsm_tester/bts.py M src/osmo_gsm_tester/bts_osmo.py 2 files changed, 18 insertions(+), 17 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved; Verified diff --git a/src/osmo_gsm_tester/bts.py b/src/osmo_gsm_tester/bts.py index fac4fd2..731f5a7 100644 --- a/src/osmo_gsm_tester/bts.py +++ b/src/osmo_gsm_tester/bts.py @@ -42,6 +42,24 @@ self.suite_run = suite_run self.conf = conf self.defaults_cfg_name = defaults_cfg_name + + def conf_for_bsc_prepare(self): + values = config.get_defaults('bsc_bts') + 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: + config.overlay(values, { 'routing_area_code': self.rac }) + if self.cellid is not None: + config.overlay(values, { 'cell_identity': self.cellid }) + if self.bvci is not None: + config.overlay(values, { 'bvci': self.bvci }) + config.overlay(values, self.conf) + + sgsn_conf = {} if self.sgsn is None else self.sgsn.conf_for_client() + config.overlay(values, sgsn_conf) + return values + ######################## # PUBLIC - INTERNAL API ######################## diff --git a/src/osmo_gsm_tester/bts_osmo.py b/src/osmo_gsm_tester/bts_osmo.py index 8629b9b..21ae135 100644 --- a/src/osmo_gsm_tester/bts_osmo.py +++ b/src/osmo_gsm_tester/bts_osmo.py @@ -35,23 +35,6 @@ 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_prepare(self): - values = config.get_defaults('bsc_bts') - 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: - config.overlay(values, { 'routing_area_code': self.rac }) - if self.cellid is not None: - config.overlay(values, { 'cell_identity': self.cellid }) - if self.bvci is not None: - config.overlay(values, { 'bvci': self.bvci }) - config.overlay(values, self.conf) - - sgsn_conf = {} if self.sgsn is None else self.sgsn.conf_for_client() - config.overlay(values, sgsn_conf) - return values - ######################## # PUBLIC - INTERNAL API ######################## -- To view, visit https://gerrit.osmocom.org/8066 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4305eefb4056ed7614118532e271efe780f4a87f Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de> Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>