summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2017-05-12 16:07:35 +0200
committerPau Espin Pedrol <pespin@sysmocom.de>2017-05-15 14:57:42 +0200
commit6ab98983bdab37e62f97461cc598a52889fd1a12 (patch)
tree240d0a774dddd84532a5f2ab7795460c9f0c96dc
parent8cd347b2c539f900f77e25aa9e706b61a2121623 (diff)
Enable GSMTAP on BTS and record it on the main unit NITB
-rw-r--r--src/osmo_gsm_tester/bts_octphy.py4
-rw-r--r--src/osmo_gsm_tester/bts_osmotrx.py4
-rw-r--r--src/osmo_gsm_tester/bts_sysmo.py3
-rw-r--r--src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl13
-rw-r--r--src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl13
-rw-r--r--src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl11
6 files changed, 45 insertions, 3 deletions
diff --git a/src/osmo_gsm_tester/bts_octphy.py b/src/osmo_gsm_tester/bts_octphy.py
index 5a73c7d..f5eb8f7 100644
--- a/src/osmo_gsm_tester/bts_octphy.py
+++ b/src/osmo_gsm_tester/bts_octphy.py
@@ -52,7 +52,9 @@ class OsmoBtsOctphy(log.Origin):
raise RuntimeError('No lib/ in %r' % self.inst)
self.env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) }
- self.launch_process(OsmoBtsOctphy.BIN_BTS_OCTPHY, '-r', '1', '-c', os.path.abspath(self.config_file))
+ self.launch_process(OsmoBtsOctphy.BIN_BTS_OCTPHY, '-r', '1',
+ '-c', os.path.abspath(self.config_file),
+ '-i', self.nitb.addr())
self.suite_run.poll()
def launch_process(self, binary_name, *args):
diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py
index e62e4e6..07f7d6e 100644
--- a/src/osmo_gsm_tester/bts_osmotrx.py
+++ b/src/osmo_gsm_tester/bts_osmotrx.py
@@ -60,7 +60,9 @@ class OsmoBtsTrx(log.Origin):
self.log('Waiting for osmo-trx to start up...')
self.suite_run.wait(self.trx_ready)
self.proc_trx.log(self.proc_trx.get_stdout_tail(1))
- self.launch_process(OsmoBtsTrx.BIN_BTS_TRX, '-r', '1', '-c', os.path.abspath(self.config_file))
+ self.launch_process(OsmoBtsTrx.BIN_BTS_TRX, '-r', '1',
+ '-c', os.path.abspath(self.config_file),
+ '-i', self.nitb.addr())
#self.launch_process(OsmoBtsTrx.BIN_PCU, '-r', '1')
self.suite_run.poll()
diff --git a/src/osmo_gsm_tester/bts_sysmo.py b/src/osmo_gsm_tester/bts_sysmo.py
index 1c36fb8..771d303 100644
--- a/src/osmo_gsm_tester/bts_sysmo.py
+++ b/src/osmo_gsm_tester/bts_sysmo.py
@@ -78,7 +78,8 @@ class SysmoBts(log.Origin):
remote_binary = self.remote_inst.child('bin', 'osmo-bts-sysmo')
self.launch_remote('osmo-bts-sysmo',
('LD_LIBRARY_PATH=%s' % remote_lib,
- remote_binary, '-c', remote_config_file, '-r', '1'),
+ remote_binary, '-c', remote_config_file, '-r', '1',
+ '-i', self.nitb.addr()),
remote_cwd=remote_run_dir)
def _process_remote(self, name, popen_args, remote_cwd=None):
diff --git a/src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl
index d41f820..b3f95df 100644
--- a/src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl
@@ -26,6 +26,19 @@ bts 0
band ${osmo_bts_octphy.band}
ipa unit-id ${osmo_bts_octphy.ipa_unit_id} 0
oml remote-ip ${osmo_bts_octphy.oml_remote_ip}
+ gsmtap-sapi bcch
+ gsmtap-sapi ccch
+ gsmtap-sapi rach
+ gsmtap-sapi agch
+ gsmtap-sapi pch
+ gsmtap-sapi sdcch
+ gsmtap-sapi tch/f
+ gsmtap-sapi tch/h
+ gsmtap-sapi pacch
+ gsmtap-sapi pdtch
+ gsmtap-sapi ptcch
+ gsmtap-sapi cbch
+ gsmtap-sapi sacch
%for trx in osmo_bts_octphy.trx_list:
trx ${loop.index}
phy ${loop.index} instance 0
diff --git a/src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl
index 39102df..cf9666b 100644
--- a/src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl
@@ -16,5 +16,18 @@ bts 0
band ${osmo_bts_sysmo.band}
ipa unit-id ${osmo_bts_sysmo.ipa_unit_id} 0
oml remote-ip ${osmo_bts_sysmo.oml_remote_ip}
+ gsmtap-sapi bcch
+ gsmtap-sapi ccch
+ gsmtap-sapi rach
+ gsmtap-sapi agch
+ gsmtap-sapi pch
+ gsmtap-sapi sdcch
+ gsmtap-sapi tch/f
+ gsmtap-sapi tch/h
+ gsmtap-sapi pacch
+ gsmtap-sapi pdtch
+ gsmtap-sapi ptcch
+ gsmtap-sapi cbch
+ gsmtap-sapi sacch
trx 0
phy 0 instance 0
diff --git a/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl
index ae74ae2..aaee223 100644
--- a/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl
@@ -20,7 +20,18 @@ bts 0
ipa unit-id ${osmo_bts_trx.ipa_unit_id} 0
oml remote-ip ${osmo_bts_trx.oml_remote_ip}
settsc
+ gsmtap-sapi bcch
gsmtap-sapi ccch
+ gsmtap-sapi rach
+ gsmtap-sapi agch
+ gsmtap-sapi pch
+ gsmtap-sapi sdcch
+ gsmtap-sapi tch/f
+ gsmtap-sapi tch/h
+ gsmtap-sapi pacch
gsmtap-sapi pdtch
+ gsmtap-sapi ptcch
+ gsmtap-sapi cbch
+ gsmtap-sapi sacch
trx 0
phy 0 instance 0