<p>Vadim Yanitskiy <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12545">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trx_toolkit/fake_trx.py: move init code to __init__()<br><br>There should be no code in run() that does initialization,<br>__init__() is the best place for this. This change allows<br>to import the Application class from fake_trx.py, and<br>run it from script (e.g. for testing).<br><br>Change-Id: I84969630348a189d237cc98354e568421839a37b<br>---<br>M src/target/trx_toolkit/fake_trx.py<br>1 file changed, 30 insertions(+), 30 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py</span><br><span>index 0bf9266..0bed29d 100755</span><br><span>--- a/src/target/trx_toolkit/fake_trx.py</span><br><span>+++ b/src/target/trx_toolkit/fake_trx.py</span><br><span>@@ -275,6 +275,32 @@</span><br><span> # List of all transceivers</span><br><span> self.trx_list = TRXList()</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ # Init shared clock generator</span><br><span style="color: hsl(120, 100%, 40%);">+ self.clck_gen = CLCKGen([])</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Power measurement emulation</span><br><span style="color: hsl(120, 100%, 40%);">+ # Noise: -120 .. -105</span><br><span style="color: hsl(120, 100%, 40%);">+ # BTS: -75 .. -50</span><br><span style="color: hsl(120, 100%, 40%);">+ self.fake_pm = FakePM(-120, -105, -75, -50)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.fake_pm.trx_list = self.trx_list</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Init TRX instance for BTS</span><br><span style="color: hsl(120, 100%, 40%);">+ self.append_trx(self.argv.bts_addr, self.argv.bts_base_port)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Init TRX instance for BB</span><br><span style="color: hsl(120, 100%, 40%);">+ self.append_trx(self.argv.bb_addr, self.argv.bb_base_port)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Additional transceivers (optional)</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.argv.trx_list is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+ for trx_def in self.argv.trx_list:</span><br><span style="color: hsl(120, 100%, 40%);">+ (addr, port, idx) = trx_def</span><br><span style="color: hsl(120, 100%, 40%);">+ self.append_child_trx(addr, port, idx)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Burst forwarding between transceivers</span><br><span style="color: hsl(120, 100%, 40%);">+ self.burst_fwd = BurstForwarder(self.trx_list)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ log.info("Init complete")</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def append_trx(self, remote_addr, base_port):</span><br><span> trx = FakeTRX(self.argv.trx_bind_addr, remote_addr, base_port,</span><br><span> clck_gen = self.clck_gen, pwr_meas = self.fake_pm)</span><br><span>@@ -301,42 +327,16 @@</span><br><span> trx_parent.child_trx_list.add_trx(trx_child)</span><br><span> </span><br><span> def run(self):</span><br><span style="color: hsl(0, 100%, 40%);">- # Init shared clock generator</span><br><span style="color: hsl(0, 100%, 40%);">- self.clck_gen = CLCKGen([])</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- # Power measurement emulation</span><br><span style="color: hsl(0, 100%, 40%);">- # Noise: -120 .. -105</span><br><span style="color: hsl(0, 100%, 40%);">- # BTS: -75 .. -50</span><br><span style="color: hsl(0, 100%, 40%);">- self.fake_pm = FakePM(-120, -105, -75, -50)</span><br><span style="color: hsl(0, 100%, 40%);">- self.fake_pm.trx_list = self.trx_list</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- # Init TRX instance for BTS</span><br><span style="color: hsl(0, 100%, 40%);">- self.append_trx(self.argv.bts_addr, self.argv.bts_base_port)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- # Init TRX instance for BB</span><br><span style="color: hsl(0, 100%, 40%);">- self.append_trx(self.argv.bb_addr, self.argv.bb_base_port)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- # Additional transceivers (optional)</span><br><span style="color: hsl(0, 100%, 40%);">- if self.argv.trx_list is not None:</span><br><span style="color: hsl(0, 100%, 40%);">- for trx_def in self.argv.trx_list:</span><br><span style="color: hsl(0, 100%, 40%);">- (addr, port, idx) = trx_def</span><br><span style="color: hsl(0, 100%, 40%);">- self.append_child_trx(addr, port, idx)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- # Burst forwarding between transceivers</span><br><span style="color: hsl(0, 100%, 40%);">- self.burst_fwd = BurstForwarder(self.trx_list)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> # Compose list of to be monitored sockets</span><br><span style="color: hsl(0, 100%, 40%);">- self.sock_list = []</span><br><span style="color: hsl(120, 100%, 40%);">+ sock_list = []</span><br><span> for trx in self.trx_list:</span><br><span style="color: hsl(0, 100%, 40%);">- self.sock_list.append(trx.ctrl_if.sock)</span><br><span style="color: hsl(0, 100%, 40%);">- self.sock_list.append(trx.data_if.sock)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- log.info("Init complete")</span><br><span style="color: hsl(120, 100%, 40%);">+ sock_list.append(trx.ctrl_if.sock)</span><br><span style="color: hsl(120, 100%, 40%);">+ sock_list.append(trx.data_if.sock)</span><br><span> </span><br><span> # Enter main loop</span><br><span> while True:</span><br><span> # Wait until we get any data on any socket</span><br><span style="color: hsl(0, 100%, 40%);">- r_event, _, _ = select.select(self.sock_list, [], [])</span><br><span style="color: hsl(120, 100%, 40%);">+ r_event, _, _ = select.select(sock_list, [], [])</span><br><span> </span><br><span> # Iterate over all transceivers</span><br><span> for trx in self.trx_list:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12545">change 12545</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/12545"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I84969630348a189d237cc98354e568421839a37b </div>
<div style="display:none"> Gerrit-Change-Number: 12545 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>