Enable GSMTAP on BTS and record it on the main unit NITB

Change-Id: I057a83bc20c5e664ac1778812452f189166919ba

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):

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()
 

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):

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

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

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