summaryrefslogtreecommitdiffstats
path: root/src/osmo_gsm_tester/bts_sysmo.py
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2017-12-14 19:14:12 +0100
committerPau Espin Pedrol <pespin@sysmocom.de>2017-12-14 19:18:58 +0100
commit81aaeefb7b9ba453aa74775bb5c99c2435ff6c80 (patch)
tree01907c6420e9eecfcc3a0bc4c53f026da383e0b5 /src/osmo_gsm_tester/bts_sysmo.py
parent2e54295bbf9bd43ed3e378ec1e8e22aa09839223 (diff)
cosmetic: bts_sysmo: Sort members according to scope
Diffstat (limited to 'src/osmo_gsm_tester/bts_sysmo.py')
-rw-r--r--src/osmo_gsm_tester/bts_sysmo.py101
1 files changed, 55 insertions, 46 deletions
diff --git a/src/osmo_gsm_tester/bts_sysmo.py b/src/osmo_gsm_tester/bts_sysmo.py
index d286d02..7a41033 100644
--- a/src/osmo_gsm_tester/bts_sysmo.py
+++ b/src/osmo_gsm_tester/bts_sysmo.py
@@ -22,6 +22,9 @@ import pprint
from . import log, config, util, template, process, pcu_sysmo, bts_osmo
class SysmoBts(bts_osmo.OsmoBts):
+##############
+# PROTECTED
+##############
run_dir = None
inst = None
remote_inst = None
@@ -35,49 +38,6 @@ class SysmoBts(bts_osmo.OsmoBts):
super().__init__(suite_run, conf, SysmoBts.BTS_SYSMO_BIN)
self.remote_user = 'root'
- def start(self):
- if self.bsc is None:
- raise RuntimeError('BTS needs to be added to a BSC or NITB before it can be started')
- log.log('Starting sysmoBTS to connect to', self.bsc)
- self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name()))
- self.configure()
-
- self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst(SysmoBts.BTS_SYSMO_BIN)))
- lib = self.inst.child('lib')
- if not os.path.isdir(lib):
- raise log.Error('No lib/ in', self.inst)
- if not self.inst.isfile('bin', SysmoBts.BTS_SYSMO_BIN):
- raise log.Error('No osmo-bts-sysmo binary in', self.inst)
-
- self.remote_dir = util.Dir(SysmoBts.REMOTE_DIR)
- self.remote_inst = util.Dir(self.remote_dir.child(os.path.basename(str(self.inst))))
-
- self.run_remote('rm-remote-dir', ('test', '!', '-d', SysmoBts.REMOTE_DIR, '||', 'rm', '-rf', SysmoBts.REMOTE_DIR))
- self.run_remote('mk-remote-dir', ('mkdir', '-p', SysmoBts.REMOTE_DIR))
- self.run_local('scp-inst-to-sysmobts',
- ('scp', '-r', str(self.inst), '%s@%s:%s' % (self.remote_user, self.remote_addr(), str(self.remote_inst))))
-
- remote_run_dir = self.remote_dir.child(SysmoBts.BTS_SYSMO_BIN)
- self.run_remote('mk-remote-run-dir', ('mkdir', '-p', remote_run_dir))
-
- remote_config_file = self.remote_dir.child(SysmoBts.BTS_SYSMO_CFG)
- self.run_local('scp-cfg-to-sysmobts',
- ('scp', '-r', self.config_file, '%s@%s:%s' % (self.remote_user, self.remote_addr(), remote_config_file)))
-
- self.run_remote('reload-dsp-firmware', ('/bin/sh', '-c', '"cat /lib/firmware/sysmobts-v?.bit > /dev/fpgadl_par0 ; cat /lib/firmware/sysmobts-v?.out > /dev/dspdl_dm644x_0"'))
-
- remote_lib = self.remote_inst.child('lib')
- remote_binary = self.remote_inst.child('bin', 'osmo-bts-sysmo')
-
- args = ('LD_LIBRARY_PATH=%s' % remote_lib,
- remote_binary, '-c', remote_config_file, '-r', '1',
- '-i', self.bsc.addr())
-
- if self._direct_pcu_enabled():
- args += ('-M',)
-
- self.proc_bts = self.launch_remote('osmo-bts-sysmo', args, remote_cwd=remote_run_dir)
-
def _direct_pcu_enabled(self):
return util.str2bool(self.conf.get('direct_pcu'))
@@ -112,9 +72,6 @@ class SysmoBts(bts_osmo.OsmoBts):
def create_pcu(self):
return pcu_sysmo.OsmoPcuSysmo(self.suite_run, self, self.conf)
- def pcu_socket_path(self):
- return os.path.join(SysmoBts.REMOTE_DIR, 'pcu_bts')
-
def configure(self):
if self.bsc is None:
raise RuntimeError('BTS needs to be added to a BSC or NITB before it can be configured')
@@ -139,6 +96,12 @@ class SysmoBts(bts_osmo.OsmoBts):
self.dbg(r)
f.write(r)
+########################
+# PUBLIC - INTERNAL API
+########################
+ def pcu_socket_path(self):
+ return os.path.join(SysmoBts.REMOTE_DIR, 'pcu_bts')
+
def conf_for_bsc(self):
values = config.get_defaults('bsc_bts')
config.overlay(values, config.get_defaults('osmo_bts_sysmo'))
@@ -158,4 +121,50 @@ class SysmoBts(bts_osmo.OsmoBts):
self.dbg(conf=values)
return values
+###################
+# PUBLIC (test API included)
+###################
+ def start(self):
+ if self.bsc is None:
+ raise RuntimeError('BTS needs to be added to a BSC or NITB before it can be started')
+ log.log('Starting sysmoBTS to connect to', self.bsc)
+ self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name()))
+ self.configure()
+
+ self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst(SysmoBts.BTS_SYSMO_BIN)))
+ lib = self.inst.child('lib')
+ if not os.path.isdir(lib):
+ raise log.Error('No lib/ in', self.inst)
+ if not self.inst.isfile('bin', SysmoBts.BTS_SYSMO_BIN):
+ raise log.Error('No osmo-bts-sysmo binary in', self.inst)
+
+ self.remote_dir = util.Dir(SysmoBts.REMOTE_DIR)
+ self.remote_inst = util.Dir(self.remote_dir.child(os.path.basename(str(self.inst))))
+
+ self.run_remote('rm-remote-dir', ('test', '!', '-d', SysmoBts.REMOTE_DIR, '||', 'rm', '-rf', SysmoBts.REMOTE_DIR))
+ self.run_remote('mk-remote-dir', ('mkdir', '-p', SysmoBts.REMOTE_DIR))
+ self.run_local('scp-inst-to-sysmobts',
+ ('scp', '-r', str(self.inst), '%s@%s:%s' % (self.remote_user, self.remote_addr(), str(self.remote_inst))))
+
+ remote_run_dir = self.remote_dir.child(SysmoBts.BTS_SYSMO_BIN)
+ self.run_remote('mk-remote-run-dir', ('mkdir', '-p', remote_run_dir))
+
+ remote_config_file = self.remote_dir.child(SysmoBts.BTS_SYSMO_CFG)
+ self.run_local('scp-cfg-to-sysmobts',
+ ('scp', '-r', self.config_file, '%s@%s:%s' % (self.remote_user, self.remote_addr(), remote_config_file)))
+
+ self.run_remote('reload-dsp-firmware', ('/bin/sh', '-c', '"cat /lib/firmware/sysmobts-v?.bit > /dev/fpgadl_par0 ; cat /lib/firmware/sysmobts-v?.out > /dev/dspdl_dm644x_0"'))
+
+ remote_lib = self.remote_inst.child('lib')
+ remote_binary = self.remote_inst.child('bin', 'osmo-bts-sysmo')
+
+ args = ('LD_LIBRARY_PATH=%s' % remote_lib,
+ remote_binary, '-c', remote_config_file, '-r', '1',
+ '-i', self.bsc.addr())
+
+ if self._direct_pcu_enabled():
+ args += ('-M',)
+
+ self.proc_bts = self.launch_remote('osmo-bts-sysmo', args, remote_cwd=remote_run_dir)
+
# vim: expandtab tabstop=4 shiftwidth=4