<p>Vadim Yanitskiy <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12184">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Pau Espin Pedrol: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trx_toolkit/fake_trx.py: drop randomization related cmd options<br><br>The randomization of both UL/DL RSSI and ToA values is optional,<br>and can be configured from the control interface (see both<br>FAKE_RSSI and FAKE_TOA commands).<br><br>The command line options for enabling / disabling the randomization<br>were redundant, so let's get rid of them and check if the<br>corresponding treshold value is set.<br><br>Change-Id: I6adc13b8989ade2fab895673525c0ca17bf9b3f2<br>---<br>M src/target/trx_toolkit/burst_fwd.py<br>M src/target/trx_toolkit/fake_trx.py<br>2 files changed, 6 insertions(+), 42 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/target/trx_toolkit/burst_fwd.py b/src/target/trx_toolkit/burst_fwd.py</span><br><span>index 6e79d44..31f882e 100644</span><br><span>--- a/src/target/trx_toolkit/burst_fwd.py</span><br><span>+++ b/src/target/trx_toolkit/burst_fwd.py</span><br><span>@@ -74,7 +74,7 @@</span><br><span> to (rssi_ul_base + rssi_ul_threshold).</span><br><span> </span><br><span> Please note that the randomization of both RSSI and ToA</span><br><span style="color: hsl(0, 100%, 40%);">- is optional, and should be enabled manually.</span><br><span style="color: hsl(120, 100%, 40%);">+ is optional, and can be enabled from the control interface.</span><br><span> </span><br><span> === Timing Advance handling</span><br><span> </span><br><span>@@ -104,14 +104,6 @@</span><br><span> self.bts_link = bts_link</span><br><span> self.bb_link = bb_link</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # Randomization of RSSI</span><br><span style="color: hsl(0, 100%, 40%);">- randomize_dl_rssi = False</span><br><span style="color: hsl(0, 100%, 40%);">- randomize_ul_rssi = False</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- # Randomization of ToA</span><br><span style="color: hsl(0, 100%, 40%);">- randomize_dl_toa256 = False</span><br><span style="color: hsl(0, 100%, 40%);">- randomize_ul_toa256 = False</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> # Init default parameters</span><br><span> self.reset_dl()</span><br><span> self.reset_ul()</span><br><span>@@ -164,7 +156,7 @@</span><br><span> # Calculates a random ToA value for Downlink bursts</span><br><span> def calc_dl_toa256(self):</span><br><span> # Check if randomization is required</span><br><span style="color: hsl(0, 100%, 40%);">- if not self.randomize_dl_toa256:</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.toa256_dl_threshold is 0:</span><br><span> return self.toa256_dl_base</span><br><span> </span><br><span> # Calculate a range for randomization</span><br><span>@@ -179,7 +171,7 @@</span><br><span> # Calculates a random ToA value for Uplink bursts</span><br><span> def calc_ul_toa256(self):</span><br><span> # Check if randomization is required</span><br><span style="color: hsl(0, 100%, 40%);">- if not self.randomize_ul_toa256:</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.toa256_ul_threshold is 0:</span><br><span> return self.toa256_ul_base</span><br><span> </span><br><span> # Calculate a range for randomization</span><br><span>@@ -194,7 +186,7 @@</span><br><span> # Calculates a random RSSI value for Downlink bursts</span><br><span> def calc_dl_rssi(self):</span><br><span> # Check if randomization is required</span><br><span style="color: hsl(0, 100%, 40%);">- if not self.randomize_dl_rssi:</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.rssi_dl_threshold is 0:</span><br><span> return self.rssi_dl_base</span><br><span> </span><br><span> # Calculate a range for randomization</span><br><span>@@ -207,7 +199,7 @@</span><br><span> # Calculates a random RSSI value for Uplink bursts</span><br><span> def calc_ul_rssi(self):</span><br><span> # Check if randomization is required</span><br><span style="color: hsl(0, 100%, 40%);">- if not self.randomize_ul_rssi:</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.rssi_ul_threshold is 0:</span><br><span> return self.rssi_ul_base</span><br><span> </span><br><span> # Calculate a range for randomization</span><br><span>diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py</span><br><span>index b818b2a..d99186b 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>@@ -46,12 +46,6 @@</span><br><span> bts_base_port = 5700</span><br><span> bb_base_port = 6700</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # BurstForwarder field randomization</span><br><span style="color: hsl(0, 100%, 40%);">- randomize_dl_toa256 = False</span><br><span style="color: hsl(0, 100%, 40%);">- randomize_ul_toa256 = False</span><br><span style="color: hsl(0, 100%, 40%);">- randomize_dl_rssi = False</span><br><span style="color: hsl(0, 100%, 40%);">- randomize_ul_rssi = False</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> def __init__(self):</span><br><span> print_copyright(CR_HOLDERS)</span><br><span> self.parse_argv()</span><br><span>@@ -85,10 +79,6 @@</span><br><span> </span><br><span> # BTS <-> BB burst forwarding</span><br><span> self.burst_fwd = BurstForwarder(self.bts_data, self.bb_data)</span><br><span style="color: hsl(0, 100%, 40%);">- self.burst_fwd.randomize_dl_toa256 = self.randomize_dl_toa256</span><br><span style="color: hsl(0, 100%, 40%);">- self.burst_fwd.randomize_ul_toa256 = self.randomize_ul_toa256</span><br><span style="color: hsl(0, 100%, 40%);">- self.burst_fwd.randomize_dl_rssi = self.randomize_dl_rssi</span><br><span style="color: hsl(0, 100%, 40%);">- self.burst_fwd.randomize_ul_rssi = self.randomize_ul_rssi</span><br><span> </span><br><span> # Share a BurstForwarder instance between BTS and BB</span><br><span> self.bts_ctrl.burst_fwd = self.burst_fwd</span><br><span>@@ -144,13 +134,7 @@</span><br><span> " -r --bb-addr Set BB remote address (default %s)\n" \</span><br><span> " -P --bts-base-port Set BTS base port number (default %d)\n" \</span><br><span> " -p --bb-base-port Set BB base port number (default %d)\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- " -b --trx-bind-addr Set TRX bind address (default %s)\n\n"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- s += " Simulation\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- " --rand-dl-rssi Enable DL RSSI randomization\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- " --rand-ul-rssi Enable UL RSSI randomization\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- " --rand-dl-toa Enable DL ToA randomization\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- " --rand-ul-toa Enable UL ToA randomization\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " -b --trx-bind-addr Set TRX bind address (default %s)\n"</span><br><span> </span><br><span> print(s % (self.bts_addr, self.bb_addr,</span><br><span> self.bts_base_port, self.bb_base_port,</span><br><span>@@ -168,8 +152,6 @@</span><br><span> "bts-addr=", "bb-addr=",</span><br><span> "bts-base-port=", "bb-base-port=",</span><br><span> "trx-bind-addr=",</span><br><span style="color: hsl(0, 100%, 40%);">- "rand-dl-rssi", "rand-ul-rssi",</span><br><span style="color: hsl(0, 100%, 40%);">- "rand-dl-toa", "rand-ul-toa",</span><br><span> ])</span><br><span> except getopt.GetoptError as err:</span><br><span> self.print_help("[!] " + str(err))</span><br><span>@@ -193,16 +175,6 @@</span><br><span> elif o in ("-b", "--trx-bind-addr"):</span><br><span> self.trx_bind_addr = v</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # Message field randomization</span><br><span style="color: hsl(0, 100%, 40%);">- elif o == "rand-dl-rssi":</span><br><span style="color: hsl(0, 100%, 40%);">- self.randomize_dl_rssi = True</span><br><span style="color: hsl(0, 100%, 40%);">- elif o == "rand-ul-rssi":</span><br><span style="color: hsl(0, 100%, 40%);">- self.randomize_ul_rssi = True</span><br><span style="color: hsl(0, 100%, 40%);">- elif o == "rand-dl-toa":</span><br><span style="color: hsl(0, 100%, 40%);">- self.randomize_dl_toa256 = True</span><br><span style="color: hsl(0, 100%, 40%);">- elif o == "rand-ul-toa":</span><br><span style="color: hsl(0, 100%, 40%);">- self.randomize_ul_toa256 = True</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> # Ensure there is no overlap between ports</span><br><span> if self.bts_base_port == self.bb_base_port:</span><br><span> self.print_help("[!] BTS and BB base ports should be different")</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12184">change 12184</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/12184"/><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: I6adc13b8989ade2fab895673525c0ca17bf9b3f2 </div>
<div style="display:none"> Gerrit-Change-Number: 12184 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>