fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/28760 )
Change subject: trx_toolkit: use **kwargs in Transceiver.__init__()
......................................................................
trx_toolkit: use **kwargs in Transceiver.__init__()
Change-Id: I65e85a2dc99e81e96d1b31b6bda5010b044b041d
---
M src/target/trx_toolkit/fake_trx.py
M src/target/trx_toolkit/transceiver.py
2 files changed, 21 insertions(+), 25 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
diff --git a/src/target/trx_toolkit/fake_trx.py
b/src/target/trx_toolkit/fake_trx.py
index a8ad9df..5bfc956 100755
--- a/src/target/trx_toolkit/fake_trx.py
+++ b/src/target/trx_toolkit/fake_trx.py
@@ -406,34 +406,31 @@
self.fake_pm.trx_list = self.trx_list
# Init TRX instance for BTS
- self.append_trx(self.argv.bts_addr,
- self.argv.bts_base_port, name = "BTS")
+ self.append_trx(self.argv.bts_addr, self.argv.bts_base_port,
name = "BTS")
# Init TRX instance for BB
- self.append_trx(self.argv.bb_addr,
- self.argv.bb_base_port, name = "MS")
+ self.append_trx(self.argv.bb_addr, self.argv.bb_base_port, name
= "MS")
# Additional transceivers (optional)
if self.argv.trx_list is not None:
for trx_def in self.argv.trx_list:
(name, addr, port, idx) = trx_def
- self.append_child_trx(addr, port, idx, name)
+ self.append_child_trx(addr, port, name = name,
child_idx = idx)
# Burst forwarding between transceivers
self.burst_fwd = BurstForwarder(self.trx_list.trx_list)
log.info("Init complete")
- def append_trx(self, remote_addr, base_port, name = None):
+ def append_trx(self, remote_addr, base_port, **kwargs):
trx = FakeTRX(self.argv.trx_bind_addr, remote_addr, base_port,
- clck_gen = self.clck_gen, pwr_meas = self.fake_pm,
- name = name)
+ clck_gen = self.clck_gen, pwr_meas = self.fake_pm,
**kwargs)
self.trx_list.add_trx(trx)
- def append_child_trx(self, remote_addr, base_port, child_idx, name =
None):
- # Index 0 corresponds to the first transceiver
- if child_idx == 0:
- self.append_trx(remote_addr, base_port, name)
+ def append_child_trx(self, remote_addr, base_port, **kwargs):
+ child_idx = kwargs.get("child_idx", 0)
+ if child_idx == 0: # Index 0 indicates parent transceiver
+ self.append_trx(remote_addr, base_port, **kwargs)
return
# Find 'parent' transceiver for a new child
@@ -444,7 +441,7 @@
# Allocate a new child
trx_child = FakeTRX(self.argv.trx_bind_addr, remote_addr,
base_port,
- child_idx = child_idx, pwr_meas = self.fake_pm, name =
name)
+ pwr_meas = self.fake_pm, **kwargs)
self.trx_list.add_trx(trx_child)
# Link a new 'child' with its 'parent'
diff --git a/src/target/trx_toolkit/transceiver.py
b/src/target/trx_toolkit/transceiver.py
index 8241001..168d3db 100644
--- a/src/target/trx_toolkit/transceiver.py
+++ b/src/target/trx_toolkit/transceiver.py
@@ -120,42 +120,41 @@
"""
- def __init__(self, bind_addr, remote_addr, base_port, name = None,
- child_idx = 0, clck_gen = None, pwr_meas = None):
+ def __init__(self, bind_addr, remote_addr, base_port, **kwargs):
# Connection info
self.remote_addr = remote_addr
self.bind_addr = bind_addr
self.base_port = base_port
- self.child_idx = child_idx
+ self.child_idx = kwargs.get("child_idx", 0)
# Meta info
- self.name = name
+ self.name = kwargs.get("name", None)
log.info("Init transceiver '%s'" % self)
# Child transceiver cannot have its own clock
- if clck_gen is not None and child_idx > 0:
+ self.clck_gen = kwargs.get("clck_gen", None)
+ if self.clck_gen is not None and self.child_idx > 0:
raise TypeError("Child transceiver cannot have its own
clock")
# Init DATA interface
self.data_if = DATAInterface(
- remote_addr, base_port + child_idx * 2 + 102,
- bind_addr, base_port + child_idx * 2 + 2)
+ remote_addr, base_port + self.child_idx * 2 + 102,
+ bind_addr, base_port + self.child_idx * 2 + 2)
# Init CTRL interface
self.ctrl_if = CTRLInterfaceTRX(self,
- remote_addr, base_port + child_idx * 2 + 101,
- bind_addr, base_port + child_idx * 2 + 1)
+ remote_addr, base_port + self.child_idx * 2 + 101,
+ bind_addr, base_port + self.child_idx * 2 + 1)
# Init optional CLCK interface
- self.clck_gen = clck_gen
- if clck_gen is not None:
+ if self.clck_gen is not None:
self.clck_if = UDPLink(
remote_addr, base_port + 100,
bind_addr, base_port)
# Optional Power Measurement interface
- self.pwr_meas = pwr_meas
+ self.pwr_meas = kwargs.get("pwr_meas", None)
# Internal state
self.running = False
7 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28760
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I65e85a2dc99e81e96d1b31b6bda5010b044b041d
Gerrit-Change-Number: 28760
Gerrit-PatchSet: 8
Gerrit-Owner: fixeria <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged
