osmo-bts-trx: Add multiTRX support
Support is limited to 1 osmo-trx with 1 phy and multiple instances. Change-Id: If2bda5ec7ac9fa3fe6bc5d71f323c3ccc2a70158
This commit is contained in:
parent
cb132bd79f
commit
44b7ea18ca
|
@ -76,6 +76,9 @@ nanobts:
|
||||||
- phys_chan_config: TCH/F # nanobts only supports PDCH in TRX0.
|
- phys_chan_config: TCH/F # nanobts only supports PDCH in TRX0.
|
||||||
- phys_chan_config: TCH/F
|
- phys_chan_config: TCH/F
|
||||||
|
|
||||||
|
osmo_bts_trx:
|
||||||
|
max_trx: 2
|
||||||
|
|
||||||
osmo_trx:
|
osmo_trx:
|
||||||
type: uhd
|
type: uhd
|
||||||
launch_trx: true
|
launch_trx: true
|
||||||
|
|
|
@ -77,7 +77,7 @@ class OsmoBtsTrx(bts_osmo.OsmoBtsMainUnit):
|
||||||
'osmo_trx': {
|
'osmo_trx': {
|
||||||
'bts_ip': self.remote_addr(),
|
'bts_ip': self.remote_addr(),
|
||||||
'trx_ip': self.trx_remote_ip(),
|
'trx_ip': self.trx_remote_ip(),
|
||||||
'channels': [{}] # TODO: implement channels for multiTRX
|
'channels': [{} for trx_i in range(self.num_trx())]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
@ -134,7 +134,8 @@ class OsmoBtsTrx(bts_osmo.OsmoBtsMainUnit):
|
||||||
|
|
||||||
self.proc_bts = self.launch_process(keepalive, OsmoBtsTrx.BIN_BTS_TRX, '-r', '1',
|
self.proc_bts = self.launch_process(keepalive, OsmoBtsTrx.BIN_BTS_TRX, '-r', '1',
|
||||||
'-c', os.path.abspath(self.config_file),
|
'-c', os.path.abspath(self.config_file),
|
||||||
'-i', self.bsc.addr())
|
'-i', self.bsc.addr(),
|
||||||
|
'-t', str(self.num_trx()))
|
||||||
self.suite_run.poll()
|
self.suite_run.poll()
|
||||||
|
|
||||||
class OsmoTrx(log.Origin, metaclass=ABCMeta):
|
class OsmoTrx(log.Origin, metaclass=ABCMeta):
|
||||||
|
|
|
@ -23,9 +23,11 @@ ctrl
|
||||||
phy 0
|
phy 0
|
||||||
osmotrx ip local ${osmo_bts_trx.osmo_trx.bts_ip}
|
osmotrx ip local ${osmo_bts_trx.osmo_trx.bts_ip}
|
||||||
osmotrx ip remote ${osmo_bts_trx.osmo_trx.trx_ip}
|
osmotrx ip remote ${osmo_bts_trx.osmo_trx.trx_ip}
|
||||||
instance 0
|
%for chan in osmo_bts_trx.osmo_trx.channels:
|
||||||
|
instance ${loop.index}
|
||||||
osmotrx rx-gain 25
|
osmotrx rx-gain 25
|
||||||
osmotrx tx-attenuation oml
|
osmotrx tx-attenuation oml
|
||||||
|
%endfor
|
||||||
bts 0
|
bts 0
|
||||||
band ${osmo_bts_trx.band}
|
band ${osmo_bts_trx.band}
|
||||||
ipa unit-id ${osmo_bts_trx.ipa_unit_id} 0
|
ipa unit-id ${osmo_bts_trx.ipa_unit_id} 0
|
||||||
|
@ -44,5 +46,7 @@ bts 0
|
||||||
gsmtap-sapi ptcch
|
gsmtap-sapi ptcch
|
||||||
gsmtap-sapi cbch
|
gsmtap-sapi cbch
|
||||||
gsmtap-sapi sacch
|
gsmtap-sapi sacch
|
||||||
trx 0
|
%for chan in osmo_bts_trx.osmo_trx.channels:
|
||||||
phy 0 instance 0
|
trx ${loop.index}
|
||||||
|
phy 0 instance ${loop.index}
|
||||||
|
%endfor
|
||||||
|
|
Loading…
Reference in New Issue