summaryrefslogtreecommitdiffstats
path: root/src/osmo_gsm_tester/bts_octphy.py
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2018-05-07 02:26:18 +0200
committerPau Espin Pedrol <pespin@sysmocom.de>2018-05-07 11:20:23 +0200
commit530681fd86c4a4dab18e4575c9cdf339623ffa49 (patch)
treeb62114751f9ee402c856b8f435dabf6854a7eaf5 /src/osmo_gsm_tester/bts_octphy.py
parentc9b63767963d70574783de147d455f19bb4f9214 (diff)
bts: Refactor conf_for_bsc_osmo
Move duplicated code into a method in the superclass. Change-Id: Ie27932f94142f667c3fb8c054b77e04afa0d5cbb
Diffstat (limited to 'src/osmo_gsm_tester/bts_octphy.py')
-rw-r--r--src/osmo_gsm_tester/bts_octphy.py16
1 files changed, 1 insertions, 15 deletions
diff --git a/src/osmo_gsm_tester/bts_octphy.py b/src/osmo_gsm_tester/bts_octphy.py
index f48afcc..70deba3 100644
--- a/src/osmo_gsm_tester/bts_octphy.py
+++ b/src/osmo_gsm_tester/bts_octphy.py
@@ -112,21 +112,7 @@ class OsmoBtsOctphy(bts_osmo.OsmoBtsMainUnit):
# PUBLIC - INTERNAL API
########################
def conf_for_bsc(self):
- values = config.get_defaults('bsc_bts')
- config.overlay(values, config.get_defaults('osmo_bts_octphy'))
- 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)
-
+ values = self.conf_for_bsc_osmo('osmo_bts_octphy')
self.dbg(conf=values)
return values