<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/23134">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trx_toolkit/data_msg.py: use uppercase for KNOWN_VERSIONS<br><br>Change-Id: Ie4dcc8e91115c514ace243a95a9b44a17cd976b4<br>Related: OS#4006, SYS#4895<br>---<br>M src/target/trx_toolkit/burst_gen.py<br>M src/target/trx_toolkit/data_if.py<br>M src/target/trx_toolkit/data_msg.py<br>M src/target/trx_toolkit/test_data_msg.py<br>4 files changed, 8 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/34/23134/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/target/trx_toolkit/burst_gen.py b/src/target/trx_toolkit/burst_gen.py</span><br><span>index 7028c24..7f154b3 100755</span><br><span>--- a/src/target/trx_toolkit/burst_gen.py</span><br><span>+++ b/src/target/trx_toolkit/burst_gen.py</span><br><span>@@ -176,7 +176,7 @@</span><br><span> help = "How many bursts to send (default %(default)s)")</span><br><span> bg_group.add_argument("-v", "--hdr-version", metavar = "VER",</span><br><span> dest = "hdr_ver", type = int,</span><br><span style="color: hsl(0, 100%, 40%);">- default = 0, choices = DATAMSG.known_versions,</span><br><span style="color: hsl(120, 100%, 40%);">+ default = 0, choices = DATAMSG.KNOWN_VERSIONS,</span><br><span> help = "TRXD header version (default %(default)s)")</span><br><span> bg_group.add_argument("-f", "--frame-number", metavar = "FN",</span><br><span> dest = "tdma_fn", type = int,</span><br><span>diff --git a/src/target/trx_toolkit/data_if.py b/src/target/trx_toolkit/data_if.py</span><br><span>index cab25aa..07f3d32 100644</span><br><span>--- a/src/target/trx_toolkit/data_if.py</span><br><span>+++ b/src/target/trx_toolkit/data_if.py</span><br><span>@@ -35,7 +35,7 @@</span><br><span> log.debug("Init TRXD interface (%s)" % self.desc_link())</span><br><span> </span><br><span> def set_hdr_ver(self, ver):</span><br><span style="color: hsl(0, 100%, 40%);">- if not ver in DATAMSG.known_versions:</span><br><span style="color: hsl(120, 100%, 40%);">+ if not ver in DATAMSG.KNOWN_VERSIONS:</span><br><span> return False</span><br><span> </span><br><span> self._hdr_ver = ver</span><br><span>@@ -43,7 +43,7 @@</span><br><span> </span><br><span> def pick_hdr_ver(self, ver_req):</span><br><span> # Pick a version that is lower or equal to ver_req</span><br><span style="color: hsl(0, 100%, 40%);">- for ver in DATAMSG.known_versions[::-1]:</span><br><span style="color: hsl(120, 100%, 40%);">+ for ver in DATAMSG.KNOWN_VERSIONS[::-1]:</span><br><span> if ver <= ver_req:</span><br><span> return ver</span><br><span> </span><br><span>diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py</span><br><span>index 19bd8dd..8b9b73c 100644</span><br><span>--- a/src/target/trx_toolkit/data_msg.py</span><br><span>+++ b/src/target/trx_toolkit/data_msg.py</span><br><span>@@ -121,7 +121,7 @@</span><br><span> </span><br><span> # NOTE: up to 16 versions can be encoded</span><br><span> CHDR_VERSION_MAX = 0b1111</span><br><span style="color: hsl(0, 100%, 40%);">- known_versions = (0, 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ KNOWN_VERSIONS = (0, 1)</span><br><span> </span><br><span> def __init__(self, fn = None, tn = None, burst = None, ver = 0):</span><br><span> self.burst = burst</span><br><span>@@ -214,7 +214,7 @@</span><br><span> def validate(self):</span><br><span> ''' Validate the message fields (throws ValueError). '''</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if not self.ver in self.known_versions:</span><br><span style="color: hsl(120, 100%, 40%);">+ if not self.ver in self.KNOWN_VERSIONS:</span><br><span> raise ValueError("Unknown TRXD header version %d" % self.ver)</span><br><span> </span><br><span> if self.fn is None:</span><br><span>@@ -268,7 +268,7 @@</span><br><span> </span><br><span> # Parse the header version first</span><br><span> self.ver = (msg[0] >> 4)</span><br><span style="color: hsl(0, 100%, 40%);">- if not self.ver in self.known_versions:</span><br><span style="color: hsl(120, 100%, 40%);">+ if not self.ver in self.KNOWN_VERSIONS:</span><br><span> raise ValueError("Unknown TRXD header version %d" % self.ver)</span><br><span> </span><br><span> # Parse TDMA TN and FN</span><br><span>diff --git a/src/target/trx_toolkit/test_data_msg.py b/src/target/trx_toolkit/test_data_msg.py</span><br><span>index 6254203..9550d36 100644</span><br><span>--- a/src/target/trx_toolkit/test_data_msg.py</span><br><span>+++ b/src/target/trx_toolkit/test_data_msg.py</span><br><span>@@ -120,7 +120,7 @@</span><br><span> </span><br><span> # Validate encoding and decoding</span><br><span> def test_enc_dec(self):</span><br><span style="color: hsl(0, 100%, 40%);">- for ver in DATAMSG.known_versions:</span><br><span style="color: hsl(120, 100%, 40%);">+ for ver in DATAMSG.KNOWN_VERSIONS:</span><br><span> with self.subTest("L1 -> TRX message", ver = ver):</span><br><span> msg = DATAMSG_L12TRX(ver = ver)</span><br><span> self._test_enc_dec(msg)</span><br><span>@@ -180,7 +180,7 @@</span><br><span> </span><br><span> # Validate message transformation</span><br><span> def test_transform(self):</span><br><span style="color: hsl(0, 100%, 40%);">- for ver in DATAMSG.known_versions:</span><br><span style="color: hsl(120, 100%, 40%);">+ for ver in DATAMSG.KNOWN_VERSIONS:</span><br><span> with self.subTest("L1 -> TRX message", ver = ver):</span><br><span> msg = DATAMSG_L12TRX(ver = ver)</span><br><span> self._test_transform(msg)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/23134">change 23134</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/c/osmocom-bb/+/23134"/><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-Change-Id: Ie4dcc8e91115c514ace243a95a9b44a17cd976b4 </div>
<div style="display:none"> Gerrit-Change-Number: 23134 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>